From: Marius Balteanu <marius.balteanu@zitec.com>
Date: Thu, 21 Oct 2021 06:30:52 +0000 (+0000)
Subject: Revert changes made in r21251 due to a test fail (#29914, #32938).
X-Git-Tag: 5.0.0~212
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=fe5c3f81de620ebe1c7cc61dcd4a41165c78de00;p=redmine.git

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 4ca32dcd0..30009dcd6 100644
--- 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 c0411e3a6..3be95ca0e 100644
--- 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