diff options
author | Santiago Pastorino <santiago@wyeworks.com> | 2013-08-25 11:34:25 -0700 |
---|---|---|
committer | Santiago Pastorino <santiago@wyeworks.com> | 2013-08-25 11:34:25 -0700 |
commit | 078da2b22de765f368a4257bce67ab4370754ee2 (patch) | |
tree | 387376713a8b8f1e091eade73137ba71b3e03168 /activerecord/lib | |
parent | 85fdc60d58fc0d38bee668a3eb1d85691d0b0b9c (diff) | |
parent | 3fd134c5594a4c05934a41bb66db4048ab5e3cb9 (diff) | |
download | rails-078da2b22de765f368a4257bce67ab4370754ee2.tar.gz rails-078da2b22de765f368a4257bce67ab4370754ee2.tar.bz2 rails-078da2b22de765f368a4257bce67ab4370754ee2.zip |
Merge pull request #12014 from wangjohn/change_deprecation_horizon
Changing deprecation_horizon to be Rails 4.2
Diffstat (limited to 'activerecord/lib')
-rw-r--r-- | activerecord/lib/active_record/migration.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/migration.rb b/activerecord/lib/active_record/migration.rb index 888e8771ce..a1ad4f6255 100644 --- a/activerecord/lib/active_record/migration.rb +++ b/activerecord/lib/active_record/migration.rb @@ -828,7 +828,7 @@ module ActiveRecord end def proper_table_name(name, options = {}) - ActiveSupport::Deprecation.warn "ActiveRecord::Migrator.proper_table_name is deprecated and will be removed in Rails 4.1. Use the proper_table_name instance method on ActiveRecord::Migration instead" + ActiveSupport::Deprecation.warn "ActiveRecord::Migrator.proper_table_name is deprecated and will be removed in Rails 4.2. Use the proper_table_name instance method on ActiveRecord::Migration instead" options = { table_name_prefix: ActiveRecord::Base.table_name_prefix, table_name_suffix: ActiveRecord::Base.table_name_suffix |