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

.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.

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