summaryrefslogtreecommitdiff
path: root/lib/ci
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2017-02-21 17:29:35 -0600
committerDouwe Maan <douwe@selenight.nl>2017-02-23 09:31:56 -0600
commit3dadf306ddc81183e74b048bc4119796852ed7ea (patch)
treef01d5e7eb9c5550bc34a42d9e88479cd3fef578d /lib/ci
parent547063b3ac096dff25309b6e0846b0d5f417c128 (diff)
downloadgitlab-ce-3dadf306ddc81183e74b048bc4119796852ed7ea.tar.gz
Enable Style/DotPosition
Diffstat (limited to 'lib/ci')
-rw-r--r--lib/ci/gitlab_ci_yaml_processor.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ci/gitlab_ci_yaml_processor.rb b/lib/ci/gitlab_ci_yaml_processor.rb
index 649ee4d018b..04d9756657a 100644
--- a/lib/ci/gitlab_ci_yaml_processor.rb
+++ b/lib/ci/gitlab_ci_yaml_processor.rb
@@ -115,8 +115,8 @@ module Ci
end
def yaml_variables(name)
- variables = (@variables || {})
- .merge(job_variables(name))
+ variables = (@variables || {}).
+ merge(job_variables(name))
variables.map do |key, value|
{ key: key.to_s, value: value, public: true }