aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorYves Senn <yves.senn@gmail.com>2013-07-01 22:47:30 -0700
committerYves Senn <yves.senn@gmail.com>2013-07-01 22:47:30 -0700
commitac54b2e85ddeeef18b6c0ecee3b8b60025ed6416 (patch)
tree096c50adeedf19d28737911d62428766c2da1035 /railties
parent9aaa3111b0b795acdb9b7035bbaa50565c7284aa (diff)
parentd50483b04894b7c21b057bca7be7d0e857ae90ac (diff)
downloadrails-ac54b2e85ddeeef18b6c0ecee3b8b60025ed6416.tar.gz
rails-ac54b2e85ddeeef18b6c0ecee3b8b60025ed6416.tar.bz2
rails-ac54b2e85ddeeef18b6c0ecee3b8b60025ed6416.zip
Merge pull request #11237 from vipulnsward/remove_whiny_nils
Remove deprecated `config.whiny_nils`
Diffstat (limited to 'railties')
-rw-r--r--railties/CHANGELOG.md4
-rw-r--r--railties/lib/rails/application/configuration.rb3
2 files changed, 4 insertions, 3 deletions
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index a7132d0a9a..a3f5796b2c 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,3 +1,7 @@
+* Remove deprecated `config.whiny_nils` option
+
+ *Vipul A M*
+
* Rename `commands/plugin_new.rb` to `commands/plugin.rb` and fix references
*Richard Schneeman*
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index 644893d9e1..0c4245b55b 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -150,9 +150,6 @@ module Rails
end
end
- def whiny_nils=(*)
- ActiveSupport::Deprecation.warn "config.whiny_nils option is deprecated and no longer works"
- end
end
end
end