Merge branch 'dev' into 'prod'

Dev

See merge request spraksamlingane/beta.ordbok.uib.no!101

.env.dev_server

 NODE_ENV=production
 VUE_APP_ARTICLE_ENDPOINT='https://oda.uib.no/opal/dev/'
 VUE_APP_SEARCH_ENDPOINT='https://oda.uib.no/opal/dev/api/'
+VUE_APP_VERSION_LABEL=DEVELOPMENT

.env.production

@@ -2,3 +2,4 @@ NODE_ENV=production
 VUE_APP_VERSION_LABEL=Beta
 VUE_APP_ARTICLE_ENDPOINT='https://oda.uib.no/opal/prod/'
 VUE_APP_SEARCH_ENDPOINT='https://oda.uib.no/opal/prod/api/'
+VUE_APP_VERSION_LABEL=DEV

.gitlab-ci.yml

@@ -24,9 +24,9 @@ build-dev:
   script:
     - |- 
           if [[ $CI_PIPELINE_SOURCE == "merge_request_event" ]]; then
-              echo "VUE_APP_VERSION_LABEL=MERGE $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME ($CI_COMMIT_SHORT_SHA)" >> .env.dev_server
+              echo "VUE_APP_RELEASE=MERGE $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME ($CI_COMMIT_SHORT_SHA)" >> .env.dev_server
           else 
-              echo "VUE_APP_VERSION_LABEL=BRANCH $CI_COMMIT_BRANCH ($CI_COMMIT_SHORT_SHA)" >> .env.dev_server
+              echo "VUE_APP_RELEASE=BRANCH $CI_COMMIT_BRANCH ($CI_COMMIT_SHORT_SHA)" >> .env.dev_server
           fi
     - npm install --progress=false
     - npm run build -- --mode dev_server

package.json

@@ -12,7 +12,7 @@
     "axios-cache-adapter": "^2.7.3",
     "core-js": "~3.6.5",
     "debounce": "^1.2.1",
-    "inflection-table": "https://git.app.uib.no/api/v4/projects/16442/jobs/artifacts/0.2.40/raw/module.tar.gz?job=publish",
+    "inflection-table": "https://git.app.uib.no/api/v4/projects/16442/jobs/artifacts/0.2.42/raw/module.tar.gz?job=publish",
     "vue": "^2.6.12",
     "vue-material-design-icons": "^4.11.0",
     "vue-plausible": "^1.1.4",