diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2015-06-21 18:37:55 +0000 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2015-06-21 18:37:55 +0000 |
| commit | f6797a7683e5367046217fa85900f0288a504f84 (patch) | |
| tree | f39abeafe541fe324a4264fefdd6b0fae7f9b976 /actionview/lib/action_view/helpers/date_helper.rb | |
| parent | 29959eb59da3cedee71d29fe84e82cfa71ad4cf3 (diff) | |
| parent | 29a64f2384f53760e9133d11a0c60e0d32ed9187 (diff) | |
| download | rails-f6797a7683e5367046217fa85900f0288a504f84.tar.gz rails-f6797a7683e5367046217fa85900f0288a504f84.tar.bz2 rails-f6797a7683e5367046217fa85900f0288a504f84.zip | |
Merge branch 'master' of github.com:rails/docrails
Conflicts:
guides/source/configuring.md
Diffstat (limited to 'actionview/lib/action_view/helpers/date_helper.rb')
| -rw-r--r-- | actionview/lib/action_view/helpers/date_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionview/lib/action_view/helpers/date_helper.rb b/actionview/lib/action_view/helpers/date_helper.rb index 98ef87e427..0633213d5e 100644 --- a/actionview/lib/action_view/helpers/date_helper.rb +++ b/actionview/lib/action_view/helpers/date_helper.rb @@ -485,7 +485,7 @@ module ActionView # The <tt>datetime</tt> can be either a +Time+ or +DateTime+ object or an integer. # Override the field name using the <tt>:field_name</tt> option, 'second' by default. # - # my_time = Time.now + 16.minutes + # my_time = Time.now + 16.seconds # # # Generates a select field for seconds that defaults to the seconds for the time in my_time. # select_second(my_time) |