From a405e8f9507e5a15b48001b35097814d34d40af3 Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Tue, 24 Sep 2019 05:21:09 +0000 Subject: [PATCH] code cleanup: rubocop: fix Style/WhileUntilModifier in app/helpers/issues_helper.rb git-svn-id: http://svn.redmine.org/redmine/trunk@18514 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- .rubocop_todo.yml | 1 - app/helpers/issues_helper.rb | 6 ++++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index d5b58b060..56a3eed3d 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -1715,7 +1715,6 @@ Style/WhenThen: # Cop supports --auto-correct. Style/WhileUntilModifier: Exclude: - - 'app/helpers/issues_helper.rb' - 'app/helpers/queries_helper.rb' - 'app/models/attachment.rb' - 'app/models/project.rb' diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb index 0cc779bac..df777d7e2 100644 --- a/app/helpers/issues_helper.rb +++ b/app/helpers/issues_helper.rb @@ -24,7 +24,8 @@ module IssuesHelper def issue_list(issues, &block) ancestors = [] issues.each do |issue| - while ancestors.any? && !issue.is_descendant_of?(ancestors.last) + while ancestors.any? && + !issue.is_descendant_of?(ancestors.last) ancestors.pop end yield issue, ancestors.size @@ -35,7 +36,8 @@ module IssuesHelper def grouped_issue_list(issues, query, &block) ancestors = [] grouped_query_results(issues, query) do |issue, group_name, group_count, group_totals| - while ancestors.any? && !issue.is_descendant_of?(ancestors.last) + while ancestors.any? && + !issue.is_descendant_of?(ancestors.last) ancestors.pop end yield issue, ancestors.size, group_name, group_count, group_totals