Merge branch 'ce-to-ee-2018-10-13' into 'master'

CE upstream - 2018-10-13 10:22 UTC

See merge request gitlab-org/gitlab-ee!7918

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

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: