Merge branch 'new-workflow' into 'master'

New workflow

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

.gitlab-ci.yml

@@ -37,6 +37,11 @@ deploy-dev:
   tags:
     - spraaksamlingene_01
   stage: deploy
+  rules:
+  - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+    when: always
+  - if: $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH
+    when: manual
   script:
   - rm -rf ~/.aws
   - mv  .aws ~/