aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/http/mime_negotiation.rb
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2012-12-07 12:35:26 -0800
committerXavier Noria <fxn@hashref.com>2012-12-07 12:35:26 -0800
commit69163ccae6a49c89e1a62ac94b98222651dd5aa8 (patch)
treeea0a5bd4d06f0e1362fdd193453de725b5605c9d /actionpack/lib/action_dispatch/http/mime_negotiation.rb
parent9cb91f93295785dd393023223976101a8dafef03 (diff)
parent1b97d41e52e4888681b81f99335d851d434458d1 (diff)
downloadrails-69163ccae6a49c89e1a62ac94b98222651dd5aa8.tar.gz
rails-69163ccae6a49c89e1a62ac94b98222651dd5aa8.tar.bz2
rails-69163ccae6a49c89e1a62ac94b98222651dd5aa8.zip
Merge pull request #8456 from frodsan/actionize2
Actionize2
Diffstat (limited to 'actionpack/lib/action_dispatch/http/mime_negotiation.rb')
-rw-r--r--actionpack/lib/action_dispatch/http/mime_negotiation.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/http/mime_negotiation.rb b/actionpack/lib/action_dispatch/http/mime_negotiation.rb
index 0f98e84788..57660e93c4 100644
--- a/actionpack/lib/action_dispatch/http/mime_negotiation.rb
+++ b/actionpack/lib/action_dispatch/http/mime_negotiation.rb
@@ -68,7 +68,7 @@ module ActionDispatch
# that are not controlled by the extension.
#
# class ApplicationController < ActionController::Base
- # before_filter :adjust_format_for_iphone
+ # before_action :adjust_format_for_iphone
#
# private
# def adjust_format_for_iphone
@@ -87,7 +87,7 @@ module ActionDispatch
# to the :html format.
#
# class ApplicationController < ActionController::Base
- # before_filter :adjust_format_for_iphone_with_html_fallback
+ # before_action :adjust_format_for_iphone_with_html_fallback
#
# private
# def adjust_format_for_iphone_with_html_fallback