summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-04-15 12:18:46 +0200
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-04-18 13:17:48 +0200
commitb7946b50fc1b23b1974f7d0306c06f6d92cc8466 (patch)
tree8f2f9980b6bf28b8d48d4ad4e7a04e983e52cbba /app
parentb578fbfb8572860490cdfd0163bfbf5f999bb1e6 (diff)
downloadgitlab-ce-b7946b50fc1b23b1974f7d0306c06f6d92cc8466.tar.gz
Read job variables directly from gitlab CI config
Diffstat (limited to 'app')
-rw-r--r--app/models/ci/build.rb8
1 files changed, 6 insertions, 2 deletions
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index 61d39caeb79..6c4ee2a0d44 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -381,8 +381,12 @@ module Ci
end
def job_yaml_variables
- options[:variables].to_h.map do |key, value|
- { key: key, value: value, public: true }
+ if commit.config_processor
+ commit.config_processor.job_variables(name).map do |key, value|
+ { key: key, value: value, public: true }
+ end
+ else
+ []
end
end