diff options
Diffstat (limited to 'lib/gitlab/ci/yaml_processor.rb')
| -rw-r--r-- | lib/gitlab/ci/yaml_processor.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/gitlab/ci/yaml_processor.rb b/lib/gitlab/ci/yaml_processor.rb index 07ba6f83d47..1ab0130ba39 100644 --- a/lib/gitlab/ci/yaml_processor.rb +++ b/lib/gitlab/ci/yaml_processor.rb @@ -70,6 +70,8 @@ module Gitlab job = @jobs.fetch(attributes[:name].to_sym) attributes + .merge(global_only: job.fetch(:global_only, {})) + .merge(global_except: job.fetch(:global_except, {})) .merge(only: job.fetch(:only, {})) .merge(except: job.fetch(:except, {})) end |