aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2012-01-04 12:09:21 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2012-01-04 12:09:21 -0700
commit49a1017235c4b73b4cdc718ee882f4cd9a7fb195 (patch)
tree0ae3b277021ea6f792e763ee2ac36a5bec114ac3
parentd9e0c4a0132ef71e9f6901440ed261037263dbc3 (diff)
downloadrails-49a1017235c4b73b4cdc718ee882f4cd9a7fb195.tar.gz
rails-49a1017235c4b73b4cdc718ee882f4cd9a7fb195.tar.bz2
rails-49a1017235c4b73b4cdc718ee882f4cd9a7fb195.zip
Add release notes URL to vendor/plugins deprecation warning. Update CHANGELOG.
-rw-r--r--railties/CHANGELOG.md2
-rw-r--r--railties/lib/rails/plugin.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 8aea017a6d..3083cf1bf2 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,6 +1,6 @@
## Rails 3.2.0 (unreleased) ##
-* Rails::Plugin is deprecated and will be removed in Rails 4.0. Instead of adding plugins to vendor/plugins use gems or bundler with path or git dependencies. *Santiago Pastorino*
+* Rails 2.3-style plugins in vendor/plugins are deprecated and will be removed in Rails 4.0. Move them out of vendor/plugins and bundle them in your Gemfile, or fold them in to your app as lib/myplugin/* and config/initializers/myplugin.rb. *Santiago Pastorino*
* Guides are available as a single .mobi for the Kindle and free Kindle readers apps. *Michael Pearson & Xavier Noria*
diff --git a/railties/lib/rails/plugin.rb b/railties/lib/rails/plugin.rb
index 883453dad5..3d179a85ae 100644
--- a/railties/lib/rails/plugin.rb
+++ b/railties/lib/rails/plugin.rb
@@ -53,7 +53,7 @@ module Rails
end
def initialize(root)
- ActiveSupport::Deprecation.warn "You have Rails 2.3-style plugins in vendor/plugins! Support for these plugins will be removed in Rails 4.0. Move them out and bundle them in your Gemfile, or fold them in to your app as lib/myplugin/* and config/initializers/myplugin.rb."
+ ActiveSupport::Deprecation.warn "You have Rails 2.3-style plugins in vendor/plugins! Support for these plugins will be removed in Rails 4.0. Move them out and bundle them in your Gemfile, or fold them in to your app as lib/myplugin/* and config/initializers/myplugin.rb. See the release notes for more on this: http://weblog.rubyonrails.org/2012/01/04/rails-3-2-0-rc2-has-been-released"
@name = File.basename(root).to_sym
config.root = root
end