diff options
| -rw-r--r-- | .rubocop_todo.yml | 11 | ||||
| -rw-r--r-- | app/models/query.rb | 1 | ||||
| -rw-r--r-- | db/migrate/001_setup.rb | 2 | ||||
| -rw-r--r-- | db/migrate/20111201201315_add_unique_index_to_issue_relations.rb | 1 | ||||
| -rw-r--r-- | test/functional/journals_controller_test.rb | 1 | ||||
| -rw-r--r-- | test/functional/users_controller_test.rb | 1 | ||||
| -rw-r--r-- | test/integration/account_test.rb | 1 | ||||
| -rw-r--r-- | test/unit/attachment_test.rb | 1 |
8 files changed, 0 insertions, 19 deletions
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 1656de0cd..0c325bb69 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -53,17 +53,6 @@ Layout/EmptyLinesAroundExceptionHandlingKeywords: - 'test/functional/settings_controller_test.rb' # This cop supports safe autocorrection (--autocorrect). -Layout/EmptyLinesAroundMethodBody: - Exclude: - - 'app/models/query.rb' - - 'db/migrate/001_setup.rb' - - 'db/migrate/20111201201315_add_unique_index_to_issue_relations.rb' - - 'test/functional/journals_controller_test.rb' - - 'test/functional/users_controller_test.rb' - - 'test/integration/account_test.rb' - - 'test/unit/attachment_test.rb' - -# This cop supports safe autocorrection (--autocorrect). # Configuration parameters: EnforcedStyle. # SupportedStyles: empty_lines, empty_lines_except_namespace, empty_lines_special, no_empty_lines Layout/EmptyLinesAroundModuleBody: diff --git a/app/models/query.rb b/app/models/query.rb index d6d319443..0f8793122 100644 --- a/app/models/query.rb +++ b/app/models/query.rb @@ -1207,7 +1207,6 @@ class Query < ApplicationRecord " SELECT customized_id FROM #{CustomValue.table_name}" + " WHERE customized_type='#{target_class}' AND custom_field_id=#{chained_custom_field_id}" + " AND #{sql_for_field(field, operator, value, CustomValue.table_name, 'value', true)}))" - end def sql_for_custom_field_attribute(field, operator, value, custom_field_id, attribute) diff --git a/db/migrate/001_setup.rb b/db/migrate/001_setup.rb index a2ae11f67..aa3760aa3 100644 --- a/db/migrate/001_setup.rb +++ b/db/migrate/001_setup.rb @@ -295,8 +295,6 @@ class Setup < ActiveRecord::Migration[4.2] user.hashed_password = "d033e22ae348aeb5660fc2140aec35850c4da997" user.admin = true user.save - - end def self.down diff --git a/db/migrate/20111201201315_add_unique_index_to_issue_relations.rb b/db/migrate/20111201201315_add_unique_index_to_issue_relations.rb index 63e6af87b..accc8ede2 100644 --- a/db/migrate/20111201201315_add_unique_index_to_issue_relations.rb +++ b/db/migrate/20111201201315_add_unique_index_to_issue_relations.rb @@ -1,6 +1,5 @@ class AddUniqueIndexToIssueRelations < ActiveRecord::Migration[4.2] def self.up - # Remove duplicates IssueRelation.connection.select_values("SELECT r.id FROM #{IssueRelation.table_name} r" + " WHERE r.id > (SELECT min(r1.id) FROM #{IssueRelation.table_name} r1 WHERE r1.issue_from_id = r.issue_from_id AND r1.issue_to_id = r.issue_to_id)").each do |i| diff --git a/test/functional/journals_controller_test.rb b/test/functional/journals_controller_test.rb index 66887dc62..e02b29ca4 100644 --- a/test/functional/journals_controller_test.rb +++ b/test/functional/journals_controller_test.rb @@ -113,7 +113,6 @@ class JournalsControllerTest < Redmine::ControllerTest end end end - end def test_diff_for_description_change diff --git a/test/functional/users_controller_test.rb b/test/functional/users_controller_test.rb index b4c9b3584..207c8afa5 100644 --- a/test/functional/users_controller_test.rb +++ b/test/functional/users_controller_test.rb @@ -962,7 +962,6 @@ class UsersControllerTest < Redmine::ControllerTest ActionMailer::Base.deliveries.clear delete :destroy, :params => {:id => 1, :confirm => User.find(1).login} assert_nil ActionMailer::Base.deliveries.last - end def test_update_unlock_admin_should_send_security_notification diff --git a/test/integration/account_test.rb b/test/integration/account_test.rb index 47dee79bc..1953588b6 100644 --- a/test/integration/account_test.rb +++ b/test/integration/account_test.rb @@ -293,7 +293,6 @@ class AccountTest < Redmine::IntegrationTest assert_equal false, User.find_by_login('jsmith').must_change_passwd? end - end def test_register_with_automatic_activation diff --git a/test/unit/attachment_test.rb b/test/unit/attachment_test.rb index b88350fba..b3e813be1 100644 --- a/test/unit/attachment_test.rb +++ b/test/unit/attachment_test.rb @@ -80,7 +80,6 @@ class AttachmentTest < ActiveSupport::TestCase end def test_copy_should_preserve_attributes - # prevent re-use of data from other attachments with equal contents Attachment.where('id <> 1').destroy_all |