Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-10-13

a7e6098c · GitLab Bot · 041420ff · 4127b357 · a7e6098c · a7e6098c
Commit a7e6098c authored Oct 13, 2018 by GitLab Bot
2 changed files
--- a/changelogs/unreleased/22311-fix-duplicated-key-in-license-management-job.yml
+++ b/changelogs/unreleased/22311-fix-duplicated-key-in-license-management-job.yml
+---
+title: "fix duplicated key in license management job auto devops gitlab ci template"
+merge_request: 22311
+author: Adam Lemanski
+type: fixed
--- a/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml
@@ -126,8 +126,8 @@ license_management:
  artifacts:
    paths: [gl-license-management-report.json]
  only:
+    refs:
      - branches
-  only:
    variables:
      - $GITLAB_FEATURES =~ /\blicense_management\b/
  except: