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 72c320b8012e99f89eda1da634f1e88949893983..e48cbcabad2b6cd27571efcb0f3fc8046e555096 100644 (file)
--- 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 c3d09fd220903d72ec1f83a544f939367e098937..e6acd0f7668fdfa9575e4892698d1f57a0f960c8 100644 (file)
--- 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