diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2013-09-03 11:55:59 -0700 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2013-09-03 11:55:59 -0700 |
| commit | 863c488bb05de3b38a81fa37349977adc0db59e3 (patch) | |
| tree | ebd9faa9d616b84490ec3c157457448647628ea8 | |
| parent | c52a4ae565671e3a3b1513a285dc887102d5eb15 (diff) | |
| parent | 2b6b5404af0cf6c40feba4a94c266c8cd37f6ddc (diff) | |
| download | rails-863c488bb05de3b38a81fa37349977adc0db59e3.tar.gz rails-863c488bb05de3b38a81fa37349977adc0db59e3.tar.bz2 rails-863c488bb05de3b38a81fa37349977adc0db59e3.zip | |
Merge pull request #12126 from namusyaka/fix-some-typos
Fix a few typos.
| -rw-r--r-- | actionpack/lib/action_controller/metal/force_ssl.rb | 2 | ||||
| -rw-r--r-- | actionview/lib/action_view/helpers/asset_url_helper.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/metal/force_ssl.rb b/actionpack/lib/action_controller/metal/force_ssl.rb index b8afce42c9..a2cb6d1e66 100644 --- a/actionpack/lib/action_controller/metal/force_ssl.rb +++ b/actionpack/lib/action_controller/metal/force_ssl.rb @@ -48,7 +48,7 @@ module ActionController # You can pass any of the following options to affect the redirect status and response # * <tt>status</tt> - Redirect with a custom status (default is 301 Moved Permanently) # * <tt>flash</tt> - Set a flash message when redirecting - # * <tt>alert</tt> - Set a alert message when redirecting + # * <tt>alert</tt> - Set an alert message when redirecting # * <tt>notice</tt> - Set a notice message when redirecting # # ==== Action Options diff --git a/actionview/lib/action_view/helpers/asset_url_helper.rb b/actionview/lib/action_view/helpers/asset_url_helper.rb index 0b957adb91..c830ab23e3 100644 --- a/actionview/lib/action_view/helpers/asset_url_helper.rb +++ b/actionview/lib/action_view/helpers/asset_url_helper.rb @@ -143,9 +143,9 @@ module ActionView "#{source}#{tail}" end - alias_method :path_to_asset, :asset_path # aliased to avoid conflicts with a asset_path named route + alias_method :path_to_asset, :asset_path # aliased to avoid conflicts with an asset_path named route - # Computes the full URL to a asset in the public directory. This + # Computes the full URL to an asset in the public directory. This # will use +asset_path+ internally, so most of their behaviors # will be the same. def asset_url(source, options = {}) |