diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2017-05-24 14:12:54 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-24 14:12:54 -0400 |
| commit | 0fa9084a18d1d9c4765c526b740f3f0b550055ca (patch) | |
| tree | 5bc022b56a6b34affaf65017f2c764bc2d58ddcd /activerecord/lib | |
| parent | 5cec1c9ac309e587ea5652a321d279b230a369d5 (diff) | |
| parent | bef95d372f9104a321cf17ac9f45316e9caac920 (diff) | |
| download | rails-0fa9084a18d1d9c4765c526b740f3f0b550055ca.tar.gz rails-0fa9084a18d1d9c4765c526b740f3f0b550055ca.tar.bz2 rails-0fa9084a18d1d9c4765c526b740f3f0b550055ca.zip | |
Merge pull request #29203 from koic/bump_rubocop_and_fix_rubocop_offences
Bump RuboCop to 0.49.0 and fix offences
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/integration.rb | 1 | ||||
| -rw-r--r-- | activerecord/lib/active_record/tasks/database_tasks.rb | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/activerecord/lib/active_record/integration.rb b/activerecord/lib/active_record/integration.rb index 441237da1e..32362fa86f 100644 --- a/activerecord/lib/active_record/integration.rb +++ b/activerecord/lib/active_record/integration.rb @@ -110,7 +110,6 @@ module ActiveRecord end end - module ClassMethods # Defines your model's +to_param+ method to generate "pretty" URLs # using +method_name+, which can be any attribute or method that diff --git a/activerecord/lib/active_record/tasks/database_tasks.rb b/activerecord/lib/active_record/tasks/database_tasks.rb index c53dee43d7..ba686fc562 100644 --- a/activerecord/lib/active_record/tasks/database_tasks.rb +++ b/activerecord/lib/active_record/tasks/database_tasks.rb @@ -71,9 +71,9 @@ module ActiveRecord @tasks[pattern] = task end - register_task(/mysql/, 'ActiveRecord::Tasks::MySQLDatabaseTasks') - register_task(/postgresql/, 'ActiveRecord::Tasks::PostgreSQLDatabaseTasks') - register_task(/sqlite/, 'ActiveRecord::Tasks::SQLiteDatabaseTasks') + register_task(/mysql/, "ActiveRecord::Tasks::MySQLDatabaseTasks") + register_task(/postgresql/, "ActiveRecord::Tasks::PostgreSQLDatabaseTasks") + register_task(/sqlite/, "ActiveRecord::Tasks::SQLiteDatabaseTasks") def db_dir @db_dir ||= Rails.application.config.paths["db"].first |