From: Marius Balteanu <marius.balteanu@zitec.com>
Date: Wed, 20 Oct 2021 22:02:03 +0000 (+0000)
Subject: Fix rubocop "Style/CombinableLoops" offense in wiki_page.rb (#29914, #32938).
X-Git-Tag: 5.0.0~215
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=a256addaf79a6bc8edb77874145c21a312a2b8e3;p=redmine.git

Fix rubocop "Style/CombinableLoops" offense in wiki_page.rb (#29914, #32938).

git-svn-id: http://svn.redmine.org/redmine/trunk@21251 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 72c320b80..e48cbcaba 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1164,7 +1164,6 @@ Style/ColonMethodCall:
 
 Style/CombinableLoops:
   Exclude:
-    - 'app/models/wiki_page.rb'
     - 'lib/redmine/default_data/loader.rb'
 
 # Cop supports --auto-correct.
diff --git a/app/models/wiki_page.rb b/app/models/wiki_page.rb
index c3d09fd22..e6acd0f76 100644
--- a/app/models/wiki_page.rb
+++ b/app/models/wiki_page.rb
@@ -321,9 +321,6 @@ class WikiAnnotate
             @lines[positions[line]][1] = current.author
           end
         end
-      end
-      d.each_slice(3) do |s|
-        sign, line = s[0], s[1]
         if sign == '-'
           positions.insert(line, -1)
         else