mirror of
https://github.com/redmine/redmine.git
synced 2025-10-28 16:56:18 +01:00
Fix RuboCop offense Layout/EmptyLinesAroundMethodBody, one of the offenses enabled in rubocop-rails-omakase (#39887).
git-svn-id: https://svn.redmine.org/redmine/trunk@22950 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
@@ -52,17 +52,6 @@ Layout/EmptyLinesAroundExceptionHandlingKeywords:
|
|||||||
- 'app/controllers/wiki_controller.rb'
|
- 'app/controllers/wiki_controller.rb'
|
||||||
- 'test/functional/settings_controller_test.rb'
|
- '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).
|
# This cop supports safe autocorrection (--autocorrect).
|
||||||
# Configuration parameters: EnforcedStyle.
|
# Configuration parameters: EnforcedStyle.
|
||||||
# SupportedStyles: empty_lines, empty_lines_except_namespace, empty_lines_special, no_empty_lines
|
# SupportedStyles: empty_lines, empty_lines_except_namespace, empty_lines_special, no_empty_lines
|
||||||
|
|||||||
@@ -1207,7 +1207,6 @@ class Query < ApplicationRecord
|
|||||||
" SELECT customized_id FROM #{CustomValue.table_name}" +
|
" SELECT customized_id FROM #{CustomValue.table_name}" +
|
||||||
" WHERE customized_type='#{target_class}' AND custom_field_id=#{chained_custom_field_id}" +
|
" 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)}))"
|
" AND #{sql_for_field(field, operator, value, CustomValue.table_name, 'value', true)}))"
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def sql_for_custom_field_attribute(field, operator, value, custom_field_id, attribute)
|
def sql_for_custom_field_attribute(field, operator, value, custom_field_id, attribute)
|
||||||
|
|||||||
@@ -295,8 +295,6 @@ class Setup < ActiveRecord::Migration[4.2]
|
|||||||
user.hashed_password = "d033e22ae348aeb5660fc2140aec35850c4da997"
|
user.hashed_password = "d033e22ae348aeb5660fc2140aec35850c4da997"
|
||||||
user.admin = true
|
user.admin = true
|
||||||
user.save
|
user.save
|
||||||
|
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def self.down
|
def self.down
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
class AddUniqueIndexToIssueRelations < ActiveRecord::Migration[4.2]
|
class AddUniqueIndexToIssueRelations < ActiveRecord::Migration[4.2]
|
||||||
def self.up
|
def self.up
|
||||||
|
|
||||||
# Remove duplicates
|
# Remove duplicates
|
||||||
IssueRelation.connection.select_values("SELECT r.id FROM #{IssueRelation.table_name} r" +
|
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|
|
" 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|
|
||||||
|
|||||||
@@ -113,7 +113,6 @@ class JournalsControllerTest < Redmine::ControllerTest
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_diff_for_description_change
|
def test_diff_for_description_change
|
||||||
|
|||||||
@@ -962,7 +962,6 @@ class UsersControllerTest < Redmine::ControllerTest
|
|||||||
ActionMailer::Base.deliveries.clear
|
ActionMailer::Base.deliveries.clear
|
||||||
delete :destroy, :params => {:id => 1, :confirm => User.find(1).login}
|
delete :destroy, :params => {:id => 1, :confirm => User.find(1).login}
|
||||||
assert_nil ActionMailer::Base.deliveries.last
|
assert_nil ActionMailer::Base.deliveries.last
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_update_unlock_admin_should_send_security_notification
|
def test_update_unlock_admin_should_send_security_notification
|
||||||
|
|||||||
@@ -293,7 +293,6 @@ class AccountTest < Redmine::IntegrationTest
|
|||||||
|
|
||||||
assert_equal false, User.find_by_login('jsmith').must_change_passwd?
|
assert_equal false, User.find_by_login('jsmith').must_change_passwd?
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_register_with_automatic_activation
|
def test_register_with_automatic_activation
|
||||||
|
|||||||
@@ -80,7 +80,6 @@ class AttachmentTest < ActiveSupport::TestCase
|
|||||||
end
|
end
|
||||||
|
|
||||||
def test_copy_should_preserve_attributes
|
def test_copy_should_preserve_attributes
|
||||||
|
|
||||||
# prevent re-use of data from other attachments with equal contents
|
# prevent re-use of data from other attachments with equal contents
|
||||||
Attachment.where('id <> 1').destroy_all
|
Attachment.where('id <> 1').destroy_all
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user