diff options
author | Robert Speicher <robert@gitlab.com> | 2016-06-01 17:36:42 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2016-06-01 17:36:42 +0000 |
commit | 164fc34eb2268aff648b688a782ac1ffdaf31c42 (patch) | |
tree | e86bee82c2bf25e780c31c4ecb1ab29792a0518c | |
parent | 4621531a40ff46650e89b62b4e60933673ef904a (diff) | |
parent | 0319d5b63233e132672b836409b8a073cab05d10 (diff) | |
download | gitlab-ce-164fc34eb2268aff648b688a782ac1ffdaf31c42.tar.gz |
Merge branch 'rubocop/enable-style-for-cop' into 'master'
Enable Style/For rubocop cop
> Do not use `for`, unless you know exactly why. Most of the time iterators should be used instead. `for` is implemented in terms of `each` (so you're adding a level of indirection), but with a twist - `for` doesn't introduce a new scope (unlike `each`) and variables defined in its block will be visible outside it.
See #17478
See merge request !4397
-rw-r--r-- | .rubocop.yml | 2 | ||||
-rw-r--r-- | app/models/network/graph.rb | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/.rubocop.yml b/.rubocop.yml index 9275f9537d5..d9c253ba1ef 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -247,7 +247,7 @@ Style/FlipFlop: # Checks use of for or each in multiline loops. Style/For: - Enabled: false + Enabled: true # Enforce the use of Kernel#sprintf, Kernel#format or String#%. Style/FormatString: diff --git a/app/models/network/graph.rb b/app/models/network/graph.rb index 1ac37e0307f..7f3387f87e2 100644 --- a/app/models/network/graph.rb +++ b/app/models/network/graph.rb @@ -205,7 +205,7 @@ module Network # Visit branching chains leaves.each do |l| parents = l.parents(@map).select{|p| p.space.zero?} - for p in parents + parents.each do |p| place_chain(p, l.time) end end @@ -223,7 +223,7 @@ module Network end def mark_reserved(time_range, space) - for day in time_range + time_range.each do |day| @reserved[day].push(space) end end @@ -232,7 +232,7 @@ module Network space_default ||= space_base reserved = [] - for day in time_range + time_range.each do |day| reserved.push(*@reserved[day]) end reserved.uniq! |