Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2017-02-23 01:54:59 +0300
committerDouwe Maan <douwe@selenight.nl>2017-02-23 18:33:19 +0300
commit56de781a2cef437b6e1af748dc0c231af74e044d (patch)
treec8186a283904e3cc7461c4289cd2e1a8a9daa69c /lib/gitlab/ci/config
parent1fe7501b49f896b74102c4b970310aa9ae34da85 (diff)
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/gitlab/ci/config')
-rw-r--r--lib/gitlab/ci/config/entry/configurable.rb10
-rw-r--r--lib/gitlab/ci/config/entry/global.rb8
-rw-r--r--lib/gitlab/ci/config/entry/jobs.rb10
3 files changed, 14 insertions, 14 deletions
diff --git a/lib/gitlab/ci/config/entry/configurable.rb b/lib/gitlab/ci/config/entry/configurable.rb
index deaaf06bbd7..e05aca9881b 100644
--- a/lib/gitlab/ci/config/entry/configurable.rb
+++ b/lib/gitlab/ci/config/entry/configurable.rb
@@ -27,9 +27,9 @@ module Gitlab
return unless valid?
self.class.nodes.each do |key, factory|
- factory.
- value(@config[key]).
- with(key: key, parent: self)
+ factory
+ .value(@config[key])
+ .with(key: key, parent: self)
@entries[key] = factory.create!
end
@@ -49,8 +49,8 @@ module Gitlab
private # rubocop:disable Lint/UselessAccessModifier
def entry(key, entry, metadata)
- factory = Entry::Factory.new(entry).
- with(description: metadata[:description])
+ factory = Entry::Factory.new(entry)
+ .with(description: metadata[:description])
(@nodes ||= {}).merge!(key.to_sym => factory)
end
diff --git a/lib/gitlab/ci/config/entry/global.rb b/lib/gitlab/ci/config/entry/global.rb
index 0a404331225..a4ec8f0ff2f 100644
--- a/lib/gitlab/ci/config/entry/global.rb
+++ b/lib/gitlab/ci/config/entry/global.rb
@@ -46,10 +46,10 @@ module Gitlab
private
def compose_jobs!
- factory = Entry::Factory.new(Entry::Jobs).
- value(@config.except(*self.class.nodes.keys)).
- with(key: :jobs, parent: self,
- description: 'Jobs definition for this pipeline')
+ factory = Entry::Factory.new(Entry::Jobs)
+ .value(@config.except(*self.class.nodes.keys))
+ .with(key: :jobs, parent: self,
+ description: 'Jobs definition for this pipeline')
@entries[:jobs] = factory.create!
end
diff --git a/lib/gitlab/ci/config/entry/jobs.rb b/lib/gitlab/ci/config/entry/jobs.rb
index 7b83f0f1b69..5671a09480b 100644
--- a/lib/gitlab/ci/config/entry/jobs.rb
+++ b/lib/gitlab/ci/config/entry/jobs.rb
@@ -31,11 +31,11 @@ module Gitlab
@config.each do |name, config|
node = hidden?(name) ? Entry::Hidden : Entry::Job
- factory = Entry::Factory.new(node).
- value(config || {}).
- metadata(name: name).
- with(key: name, parent: self,
- description: "#{name} job definition.")
+ factory = Entry::Factory.new(node)
+ .value(config || {})
+ .metadata(name: name)
+ .with(key: name, parent: self,
+ description: "#{name} job definition.")
@entries[name] = factory.create!
end