diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-09 15:07:58 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-09 15:07:58 +0300 |
| commit | 93c6764dacd4c605027ef1cd367d3aebe420b223 (patch) | |
| tree | 5213b1fc874ee3e31701a81007f97d7664b95205 /lib/gitlab/ci | |
| parent | aa10b541b6a3fbc7fa712abcc59d073fc8dc620a (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/ci')
| -rw-r--r-- | lib/gitlab/ci/config/entry/job.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/ci/config/entry/job.rb b/lib/gitlab/ci/config/entry/job.rb index 1aa2d6d0bcb..0c431c0a1de 100644 --- a/lib/gitlab/ci/config/entry/job.rb +++ b/lib/gitlab/ci/config/entry/job.rb @@ -173,7 +173,7 @@ module Gitlab @entries.delete(:type) # This is something of a hack, see issue for details: - # https://gitlab.com/gitlab-org/gitlab-foss/issues/67150 + # https://gitlab.com/gitlab-org/gitlab/issues/31685 if !only_defined? && has_rules? @entries.delete(:only) @entries.delete(:except) |