diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-05-27 19:08:23 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-05-27 19:10:14 -0300 |
| commit | 6c5f43bab8206747a8591435b2aa0ff7051ad3de (patch) | |
| tree | 57a86e85ffcc3f046ee8a8edd6652048a27c3c52 /railties | |
| parent | cd037783b038d0f0ad8fce32067aa7743666bd02 (diff) | |
| download | rails-6c5f43bab8206747a8591435b2aa0ff7051ad3de.tar.gz rails-6c5f43bab8206747a8591435b2aa0ff7051ad3de.tar.bz2 rails-6c5f43bab8206747a8591435b2aa0ff7051ad3de.zip | |
Deprecate all *_filter callbacks in favor of *_action callbacks
This is the continuation of the work started at
9d62e04838f01f5589fa50b0baa480d60c815e2c
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/info_controller.rb | 2 | ||||
| -rw-r--r-- | railties/lib/rails/mailers_controller.rb | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/railties/lib/rails/info_controller.rb b/railties/lib/rails/info_controller.rb index 908c4ce65e..49e5431a16 100644 --- a/railties/lib/rails/info_controller.rb +++ b/railties/lib/rails/info_controller.rb @@ -5,7 +5,7 @@ class Rails::InfoController < Rails::ApplicationController # :nodoc: prepend_view_path ActionDispatch::DebugExceptions::RESCUES_TEMPLATE_PATH layout -> { request.xhr? ? false : 'application' } - before_filter :require_local! + before_action :require_local! def index redirect_to action: :routes diff --git a/railties/lib/rails/mailers_controller.rb b/railties/lib/rails/mailers_controller.rb index dd318f52e5..32740d66da 100644 --- a/railties/lib/rails/mailers_controller.rb +++ b/railties/lib/rails/mailers_controller.rb @@ -3,8 +3,8 @@ require 'rails/application_controller' class Rails::MailersController < Rails::ApplicationController # :nodoc: prepend_view_path ActionDispatch::DebugExceptions::RESCUES_TEMPLATE_PATH - before_filter :require_local! - before_filter :find_preview, only: :preview + before_action :require_local! + before_action :find_preview, only: :preview def index @previews = ActionMailer::Preview.all @@ -70,4 +70,4 @@ class Rails::MailersController < Rails::ApplicationController # :nodoc: @email end end -end
\ No newline at end of file +end |