diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2010-01-17 03:20:30 +0530 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2010-01-17 03:20:30 +0530 |
| commit | b04230e3bbf912d60601e9e7b797c4cd43581d51 (patch) | |
| tree | 97a2f784a2ec2bfae4f960af56a9280dad6f7774 /activeresource/lib/active_resource/railtie.rb | |
| parent | 867829b187969607aa12f2b0457f25da9c204db0 (diff) | |
| parent | 6e3bee6cf1f0d2684152292db0a8b757249824fd (diff) | |
| download | rails-b04230e3bbf912d60601e9e7b797c4cd43581d51.tar.gz rails-b04230e3bbf912d60601e9e7b797c4cd43581d51.tar.bz2 rails-b04230e3bbf912d60601e9e7b797c4cd43581d51.zip | |
Merge remote branch 'mainstream/master'
Conflicts:
actionpack/lib/action_controller/metal/flash.rb
Diffstat (limited to 'activeresource/lib/active_resource/railtie.rb')
| -rw-r--r-- | activeresource/lib/active_resource/railtie.rb | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/activeresource/lib/active_resource/railtie.rb b/activeresource/lib/active_resource/railtie.rb index 4f264c82b8..1b9307d472 100644 --- a/activeresource/lib/active_resource/railtie.rb +++ b/activeresource/lib/active_resource/railtie.rb @@ -1,2 +1,11 @@ require "active_resource" -require "rails"
\ No newline at end of file +require "rails" + +module ActiveResource + class Railtie < Rails::Railtie + plugin_name :active_resource + + require "active_resource/railties/subscriber" + subscriber ActiveResource::Railties::Subscriber.new + end +end
\ No newline at end of file |