backout r13743

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

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 93bfc869ea67abdbcb550fa35bca6bdf0a87efc9..72ef997a79bd7af2f3aa487697eb8ab233adb1b4 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -109,7 +109,6 @@ Layout/CommentIndentation:
     - 'app/helpers/versions_helper.rb'
     - 'app/models/mailer.rb'
     - 'lib/redmine/wiki_formatting/textile/redcloth3.rb'
-    - 'test/unit/issue_test.rb'
     - 'test/unit/lib/redmine/wiki_formatting/markdown_formatter_test.rb'
     - 'test/unit/lib/redmine/wiki_formatting/textile_formatter_test.rb'
 

diff --git a/test/unit/issue_test.rb b/test/unit/issue_test.rb
index f4287e48d6bbc55323a88acb63390c746a4697bf..c33971720bf577de80aad297e58b11bbfc73c8a5 100644 (file)
--- a/test/unit/issue_test.rb
+++ b/test/unit/issue_test.rb
@@ -1502,8 +1502,8 @@ class IssueTest < ActiveSupport::TestCase
     IssueRelation.create!(:issue_from => issue2, :issue_to => issue1,
                           :relation_type => IssueRelation::TYPE_DUPLICATES)
     # And 3 is a dupe of 2
-#    IssueRelation.create!(:issue_from => issue3, :issue_to => issue2,
-#                          :relation_type => IssueRelation::TYPE_DUPLICATES)
+    IssueRelation.create!(:issue_from => issue3, :issue_to => issue2,
+                          :relation_type => IssueRelation::TYPE_DUPLICATES)
     # And 3 is a dupe of 1 (circular duplicates)
     IssueRelation.create!(:issue_from => issue3, :issue_to => issue1,
                           :relation_type => IssueRelation::TYPE_DUPLICATES)