aboutsummaryrefslogtreecommitdiffstats
path: root/actionview
diff options
context:
space:
mode:
authorMax Kramer <mckramer@gmail.com>2014-06-28 14:30:16 -0400
committerMax Kramer <mckramer@gmail.com>2014-06-28 14:30:16 -0400
commit4e1dc1128306c3ecad81bd6e46ed0c2fc5501751 (patch)
tree46b03ab3d4a9d33a74a6b496e0e1da899e59db79 /actionview
parentb44174f8c8f3b9b8040955f981d30e64558f0044 (diff)
downloadrails-4e1dc1128306c3ecad81bd6e46ed0c2fc5501751.tar.gz
rails-4e1dc1128306c3ecad81bd6e46ed0c2fc5501751.tar.bz2
rails-4e1dc1128306c3ecad81bd6e46ed0c2fc5501751.zip
Rename options param of #time_ago_in_words to match API change
Rename `include_seconds_or_options` to `options` to match 6b9356a (which removed the deprecation introduced by #6077). This has no functional impact because the parameter is passed directly through, but makes it clearer that the parameter no longer supports a boolean as input.
Diffstat (limited to 'actionview')
-rw-r--r--actionview/lib/action_view/helpers/date_helper.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionview/lib/action_view/helpers/date_helper.rb b/actionview/lib/action_view/helpers/date_helper.rb
index 2efb9612ac..27c7a26098 100644
--- a/actionview/lib/action_view/helpers/date_helper.rb
+++ b/actionview/lib/action_view/helpers/date_helper.rb
@@ -153,8 +153,8 @@ module ActionView
#
# Note that you cannot pass a <tt>Numeric</tt> value to <tt>time_ago_in_words</tt>.
#
- def time_ago_in_words(from_time, include_seconds_or_options = {})
- distance_of_time_in_words(from_time, Time.now, include_seconds_or_options)
+ def time_ago_in_words(from_time, options = {})
+ distance_of_time_in_words(from_time, Time.now, options)
end
alias_method :distance_of_time_in_words_to_now, :time_ago_in_words