diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-06-29 12:36:11 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-06-29 12:36:11 -0300 |
| commit | 60e1aea9e654877be5f8837d82ff2d36392e5adf (patch) | |
| tree | 2663050eec96ea39bda21f873a0fcffeb3157ddb /actionview | |
| parent | 85cfc10b82664f6455568f1e2abe06f63482e90b (diff) | |
| parent | 4e1dc1128306c3ecad81bd6e46ed0c2fc5501751 (diff) | |
| download | rails-60e1aea9e654877be5f8837d82ff2d36392e5adf.tar.gz rails-60e1aea9e654877be5f8837d82ff2d36392e5adf.tar.bz2 rails-60e1aea9e654877be5f8837d82ff2d36392e5adf.zip | |
Merge pull request #15961 from mckramer/patch-1
Rename options param of #time_ago_in_words to match API change
Diffstat (limited to 'actionview')
| -rw-r--r-- | actionview/lib/action_view/helpers/date_helper.rb | 4 |
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 |