diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2018-10-13 10:06:07 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2018-10-13 10:06:07 +0000 |
| commit | 4127b357881fedbf903159e089cc0c9d99c37eff (patch) | |
| tree | 5ec14a61697daf9b995c9084062aae1d3ee853de | |
| parent | 79ba38920144191320df1e6529b8feab4acef758 (diff) | |
| parent | dfef5ba2e2cee67b74ab5d143cc7fec90da3d8a5 (diff) | |
| download | gitlab-ce-4127b357881fedbf903159e089cc0c9d99c37eff.tar.gz | |
Merge branch 'fix-dupilicate-key-license-management' into 'master'
Fix duplicated key in license management job gitlab-org/gitlab-ce#52609
Closes #52609
See merge request gitlab-org/gitlab-ce!22311
| -rw-r--r-- | changelogs/unreleased/22311-fix-duplicated-key-in-license-management-job.yml | 5 | ||||
| -rw-r--r-- | lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml | 4 |
2 files changed, 7 insertions, 2 deletions
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 new file mode 100644 index 00000000000..ab64a1387d9 --- /dev/null +++ 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 index 72547c1b407..6fa59e41d20 100644 --- 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: |