summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-05-30 11:37:14 +0200
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-05-30 11:37:14 +0200
commit0ea017d99744ee3a7574535fad69cfc0686fd292 (patch)
treebce1a5044bbbca2f2d983618d5add4bb96a4e1d1
parent43c35b0f20fb3bb67ea2b96bf8f806c7e95b6aec (diff)
downloadgitlab-ce-0ea017d99744ee3a7574535fad69cfc0686fd292.tar.gz
Enable Style/WhileUntilDo rubocop style copstyle/enable-while-until-do-rubocop-style-cop
See #17478
-rw-r--r--.rubocop.yml2
-rw-r--r--app/models/network/graph.rb2
-rw-r--r--lib/gitlab/ci/build/artifacts/metadata.rb2
3 files changed, 3 insertions, 3 deletions
diff --git a/.rubocop.yml b/.rubocop.yml
index 2d8eb4077f3..0edb07189d4 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -705,7 +705,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')