Revert changes made in r21251 due to a test fail (#29914, #32938).

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

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 4ca32dcd025fd58405451a67b2ad1fa81b558e45..30009dcd66ec976d04cf2180cf2945137df27c28 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1163,6 +1163,7 @@ Style/ColonMethodCall:
 
 Style/CombinableLoops:
   Exclude:
+    - 'app/models/wiki_annotate.rb'
     - 'lib/redmine/default_data/loader.rb'
 
 # Cop supports --auto-correct.

diff --git a/app/models/wiki_annotate.rb b/app/models/wiki_annotate.rb
index c0411e3a63ffb37a10265ff56075a4baf0bc2267..3be95ca0e69b76ab76a1913245e6e72e7626dd22 100644 (file)
--- a/app/models/wiki_annotate.rb
+++ b/app/models/wiki_annotate.rb
@@ -37,6 +37,9 @@ 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