Merge branch 'fix-dupilicate-key-license-management' into 'master'

dzaporozhets · dzaporozhets · commit 4127b357881f · 2018-10-13T10:06:07.000Z
Fix duplicated key in license management job gitlab-org/gitlab-ce#52609

Closes #52609

See merge request gitlab-org/gitlab-ce!22311
diff --git a/changelogs/unreleased/22311-fix-duplicated-key-in-license-management-job.yml b/changelogs/unreleased/22311-fix-duplicated-key-in-license-management-job.yml
@@ -0,0 +1,5 @@
+---
+title: "fix duplicated key in license management job auto devops gitlab ci template"
+merge_request: 22311
+author: Adam Lemanski
+type: fixed
diff --git 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:
-    - branches
-  only:
+    refs:
+      - branches
     variables:
       - $GITLAB_FEATURES =~ /\blicense_management\b/
   except:
