diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-02-22 16:54:59 -0600 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-02-23 09:33:19 -0600 |
| commit | 56de781a2cef437b6e1af748dc0c231af74e044d (patch) | |
| tree | c8186a283904e3cc7461c4289cd2e1a8a9daa69c /lib/ci | |
| parent | 1fe7501b49f896b74102c4b970310aa9ae34da85 (diff) | |
| download | gitlab-ce-56de781a2cef437b6e1af748dc0c231af74e044d.tar.gz | |
Revert "Enable Style/DotPosition"
This reverts commit e00fb2bdc2090e9cabeb1eb35a2672a882cc96e9.
# Conflicts:
# .rubocop.yml
# .rubocop_todo.yml
# lib/gitlab/ci/config/entry/global.rb
# lib/gitlab/ci/config/entry/jobs.rb
# spec/lib/gitlab/ci/config/entry/factory_spec.rb
# spec/lib/gitlab/ci/config/entry/global_spec.rb
# spec/lib/gitlab/ci/config/entry/job_spec.rb
# spec/lib/gitlab/ci/status/build/factory_spec.rb
# spec/lib/gitlab/incoming_email_spec.rb
Diffstat (limited to 'lib/ci')
| -rw-r--r-- | lib/ci/gitlab_ci_yaml_processor.rb | 4 |
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 04d9756657a..649ee4d018b 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 } |