diff options
| author | Jon Moss <maclover7@users.noreply.github.com> | 2016-09-17 15:56:30 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-17 15:56:30 -0400 |
| commit | 7ccd32412e617884f21edb240df9030b8e3b58ea (patch) | |
| tree | 7cba066de186657ac86e9fff566a95ccd32df57a /actionview/lib/action_view | |
| parent | 34d2aed03bf7edde8791e8728805a7b7b0d41045 (diff) | |
| parent | e1252e073a6be072d82f0984332e851190323ef6 (diff) | |
| download | rails-7ccd32412e617884f21edb240df9030b8e3b58ea.tar.gz rails-7ccd32412e617884f21edb240df9030b8e3b58ea.tar.bz2 rails-7ccd32412e617884f21edb240df9030b8e3b58ea.zip | |
Merge pull request #26534 from Neodelf/new_branch_name
[ci skip] Fixed commas according to Oxford comma in rdoc and guides
Diffstat (limited to 'actionview/lib/action_view')
| -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 61ce1d36e0..04c5fd4218 100644 --- a/actionview/lib/action_view/helpers/date_helper.rb +++ b/actionview/lib/action_view/helpers/date_helper.rb @@ -303,7 +303,7 @@ module ActionView # # the sunrise attribute. # time_select("article", "start_time", include_seconds: true) # - # # You can set the <tt>:minute_step</tt> to 15 which will give you: 00, 15, 30 and 45. + # # You can set the <tt>:minute_step</tt> to 15 which will give you: 00, 15, 30, and 45. # time_select 'game', 'game_time', {minute_step: 15} # # # Creates a time select tag with a custom prompt. Use <tt>prompt: true</tt> for generic prompts. |