diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-05-30 17:36:30 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-05-30 17:36:30 +0000 |
| commit | 38e0e399de115111fdbbfd890503519ad58e29a3 (patch) | |
| tree | 18682d069c4af60316484d7242f002a2a26420b7 | |
| parent | 8cb7759b92685f8dc40c7829eb1114f55eee5271 (diff) | |
| parent | 0ea017d99744ee3a7574535fad69cfc0686fd292 (diff) | |
| download | gitlab-ce-38e0e399de115111fdbbfd890503519ad58e29a3.tar.gz | |
Merge branch 'style/enable-while-until-do-rubocop-style-cop' into 'master'
Enable Style/WhileUntilDo rubocop style cop
Checks for redundant `do` after `while` or `until`.
See #17478
See merge request !4350
| -rw-r--r-- | .rubocop.yml | 2 | ||||
| -rw-r--r-- | app/models/network/graph.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/ci/build/artifacts/metadata.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/.rubocop.yml b/.rubocop.yml index 9074dcff1f4..089ae7adbcf 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -704,7 +704,7 @@ Style/WhenThen: # Checks for redundant do after while or until. Style/WhileUntilDo: - Enabled: false + Enabled: true # Favor modifier while/until usage when you have a single-line body. Style/WhileUntilModifier: diff --git a/app/models/network/graph.rb b/app/models/network/graph.rb index 9259cb1a0fa..ec32b509ee0 100644 --- a/app/models/network/graph.rb +++ b/app/models/network/graph.rb @@ -231,7 +231,7 @@ module Network reserved.uniq! space = space_default - while reserved.include?(space) do + while reserved.include?(space) space += space_step if space < space_base then space_step *= -1 diff --git a/lib/gitlab/ci/build/artifacts/metadata.rb b/lib/gitlab/ci/build/artifacts/metadata.rb index f2020c82d40..cd2e83b4c27 100644 --- a/lib/gitlab/ci/build/artifacts/metadata.rb +++ b/lib/gitlab/ci/build/artifacts/metadata.rb @@ -56,7 +56,7 @@ module Gitlab child_pattern = '[^/]*/?$' unless @opts[:recursive] match_pattern = /^#{Regexp.escape(@path)}#{child_pattern}/ - until gz.eof? do + until gz.eof? begin path = read_string(gz).force_encoding('UTF-8') meta = read_string(gz).force_encoding('UTF-8') |