From 0ea017d99744ee3a7574535fad69cfc0686fd292 Mon Sep 17 00:00:00 2001 From: Grzegorz Bizon Date: Mon, 30 May 2016 11:37:14 +0200 Subject: Enable Style/WhileUntilDo rubocop style cop See #17478 --- .rubocop.yml | 2 +- app/models/network/graph.rb | 2 +- lib/gitlab/ci/build/artifacts/metadata.rb | 2 +- 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') -- cgit v1.2.1