diff options
| author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2019-09-19 05:49:21 +0000 |
|---|---|---|
| committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2019-09-19 05:49:21 +0000 |
| commit | 5611ee0e0280a234f2d4f9b3e7b830eb6db50617 (patch) | |
| tree | a0e4041e94a83dd3ea42c035bb6e0d834d08312a | |
| parent | c7c2bb2b24920c1a0c96f0fe503fcaaf3499b1b1 (diff) | |
| download | redmine-5611ee0e0280a234f2d4f9b3e7b830eb6db50617.tar.gz redmine-5611ee0e0280a234f2d4f9b3e7b830eb6db50617.zip | |
backout r13743
git-svn-id: http://svn.redmine.org/redmine/trunk@18478 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | .rubocop_todo.yml | 1 | ||||
| -rw-r--r-- | test/unit/issue_test.rb | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 93bfc869e..72ef997a7 100644 --- 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 f4287e48d..c33971720 100644 --- 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) |