From 15f9c6dfc6cf4560dc09a43603dbd79812b38327 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ole=20Volds=C3=A6ter?= <ole.voldsater@uib.no>
Date: Thu, 22 Apr 2021 12:33:50 +0200
Subject: [PATCH] =?UTF-8?q?tooltip=20med=20release-identifikator=20p=C3=A5?=
=?UTF-8?q?=20"Beta"-etiketten?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.gitlab-ci.yml | 1 +
src/App.vue | 5 +++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8205f254..f269cf02 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,6 +21,7 @@ build-prod:
only:
- /^release_.*$/
script:
+ - echo "VUE_APP_RELEASE=$CI_COMMIT_REF_NAME" >> .env.production
- npm install --progress=false
- npm run build -- --mode production
artifacts:
diff --git a/src/App.vue b/src/App.vue
index 5eff7cf2..4c11e4dd 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -3,7 +3,7 @@
<header>
<div class="about-link"><router-link to="/om">OM ORDBØKENE</router-link></div>
<h1><a :class="$vuetify.breakpoint.name" href="/">Ordbøkene</a></h1>
- <div class="beta">{{version_label}}</div>
+ <div class="beta" :title="release">{{version_label}}</div>
<p class="sub-title"><router-link to="/">Bokmålsordboka og Nynorskordboka</router-link></p>
</header>
<router-view></router-view>
@@ -22,7 +22,8 @@
export default {
data: function() {
return {
- version_label: process.env.VUE_APP_VERSION_LABEL
+ version_label: process.env.VUE_APP_VERSION_LABEL,
+ release: process.env.VUE_APP_RELEASE
}
}
}
--
GitLab