kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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
This commit is contained in:
Dmitriy Zaporozhets 2018-10-13 10:06:07 +00:00
parent 79ba389201 dfef5ba2e2
commit 4127b35788
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changelogs/unreleased/22311-fix-duplicated-key-in-license-management-job.yml Normal file
View File

@ -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

4
lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml
View File

@ -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: