mirrors
/
rails
mirror of https://github.com/rails/rails
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix a RuboCop offences using `rubocop -a`

This commit is contained in:
Koichi ITO 2017-05-24 15:21:02 +09:00
parent 525586417e
commit bef95d372f
4 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
activerecord/lib/active_record/integration.rb
View File

@ -110,7 +110,6 @@ module ActiveRecord
end end
end end
module ClassMethods module ClassMethods
# Defines your model's +to_param+ method to generate "pretty" URLs # Defines your model's +to_param+ method to generate "pretty" URLs
# using +method_name+, which can be any attribute or method that # using +method_name+, which can be any attribute or method that

6
activerecord/lib/active_record/tasks/database_tasks.rb
View File

@ -71,9 +71,9 @@ module ActiveRecord
@tasks[pattern] = task @tasks[pattern] = task
end end
register_task(/mysql/, 'ActiveRecord::Tasks::MySQLDatabaseTasks') register_task(/mysql/, "ActiveRecord::Tasks::MySQLDatabaseTasks")
register_task(/postgresql/, 'ActiveRecord::Tasks::PostgreSQLDatabaseTasks') register_task(/postgresql/, "ActiveRecord::Tasks::PostgreSQLDatabaseTasks")
register_task(/sqlite/, 'ActiveRecord::Tasks::SQLiteDatabaseTasks') register_task(/sqlite/, "ActiveRecord::Tasks::SQLiteDatabaseTasks")
def db_dir def db_dir
@db_dir ||= Rails.application.config.paths["db"].first @db_dir ||= Rails.application.config.paths["db"].first

2
activerecord/test/cases/associations/callbacks_test.rb
View File

@ -128,7 +128,7 @@ class AssociationCallbacksTest < ActiveRecord::TestCase
assert ar.developers_log.empty? assert ar.developers_log.empty?
alice = Developer.new(name: "alice") alice = Developer.new(name: "alice")
ar.developers_with_callbacks << alice ar.developers_with_callbacks << alice
assert_equal"after_adding#{alice.id}", ar.developers_log.last assert_equal "after_adding#{alice.id}", ar.developers_log.last
bob = ar.developers_with_callbacks.create(name: "bob") bob = ar.developers_with_callbacks.create(name: "bob")
assert_equal "after_adding#{bob.id}", ar.developers_log.last assert_equal "after_adding#{bob.id}", ar.developers_log.last

2
activesupport/lib/active_support/cache.rb
View File

@ -536,7 +536,6 @@ module ActiveSupport
end end
end end
# Prefixes a key with the namespace. Namespace and key will be delimited # Prefixes a key with the namespace. Namespace and key will be delimited
# with a colon. # with a colon.
def normalize_key(key, options) def normalize_key(key, options)
@ -587,7 +586,6 @@ module ActiveSupport
ActiveSupport::Notifications.instrument("cache_#{operation}.active_support", payload) { yield(payload) } ActiveSupport::Notifications.instrument("cache_#{operation}.active_support", payload) { yield(payload) }
end end
def log def log
return unless logger && logger.debug? && !silence? return unless logger && logger.debug? && !silence?
logger.debug(yield) logger.debug(yield)