diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2016-11-22 12:20:45 +0300 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2016-11-22 12:20:45 +0300 |
| commit | 0f590750307bdd871b20a8d87fc6963d95f2e00c (patch) | |
| tree | 11ac798f16751538ce00832920942d077c59b144 /lib | |
| parent | 60c2d5907226be8cca4b911cf5a85779ab587dd2 (diff) | |
| parent | 50e1bed49463ce5350b735949992e9a12857d6aa (diff) | |
Merge branch 'fix/ci-linter-undefined-error' into 'master'
Fix undefined error in CI linter
## What does this MR do?
This MR fixes undefined error in CI linter.
## Does this MR meet the acceptance criteria?
- [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added
- [x] Tests added for this feature/bug
## What are the relevant issue numbers?
Closes #24759
See merge request !7650
Diffstat (limited to 'lib')
| -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 20dcc024b4e..a55362f0b6b 100644 --- a/lib/gitlab/ci/config/entry/job.rb +++ b/lib/gitlab/ci/config/entry/job.rb @@ -108,7 +108,7 @@ module Gitlab self.class.nodes.each_key do |key| global_entry = deps[key] - job_entry = @entries[key] + job_entry = self[key] if global_entry.specified? && !job_entry.specified? @entries[key] = global_entry |