summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2018-12-01 13:38:10 +0100
committerKamil Trzciński <ayufan@ayufan.eu>2018-12-01 13:41:15 +0100
commit80c09698532cbb1e8bb1c20e85847306cea0209e (patch)
treea389f8cf27c603c99df8722390b2c2920a085f23
parent4c34fd8ef1a3bc0e0b8e0463f3630738106231f9 (diff)
downloadgitlab-ce-refactor-pipeline-seeds.tar.gz
-rw-r--r--lib/gitlab/ci/config/entry/job.rb7
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/gitlab/ci/config/entry/job.rb b/lib/gitlab/ci/config/entry/job.rb
index b73cf96ca14..3a15bbd933e 100644
--- a/lib/gitlab/ci/config/entry/job.rb
+++ b/lib/gitlab/ci/config/entry/job.rb
@@ -111,7 +111,7 @@ module Gitlab
end
def value
- @config.merge(to_hash.compact)
+ to_hash.compact
end
def commands
@@ -159,6 +159,11 @@ module Gitlab
only: only_value,
except: except_value,
variables: merged_variables,
+ tags: config[:tags],
+ when: config[:when],
+ start_in: config[:start_in],
+ dependencies: config[:dependencies],
+ extends: config[:extends],
environment: environment_defined? ? environment_value : nil,
coverage_regex: coverage_defined? ? coverage_value : nil,
retry: retry_defined? ? retry_value : nil,