diff options
author | Rafael França <rafael@franca.dev> | 2019-07-26 16:03:37 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-07-26 16:03:37 -0400 |
commit | a0e58e687dec52d42ebadfbb72e1eae449b13ba5 (patch) | |
tree | 1a46d030a62ff61427a73d5e3c145ee1bd111baf /actionview | |
parent | abaa73f34ae71362e0c61e212106ddc2a62f8b02 (diff) | |
parent | 5ee4a57a26a7863c7ff610dd3a46c04e0f53f7f7 (diff) | |
download | rails-a0e58e687dec52d42ebadfbb72e1eae449b13ba5.tar.gz rails-a0e58e687dec52d42ebadfbb72e1eae449b13ba5.tar.bz2 rails-a0e58e687dec52d42ebadfbb72e1eae449b13ba5.zip |
Merge pull request #36178 from sshaw/fix_time_zone_options_priority
Update time_zone_options_for_select docs
Diffstat (limited to 'actionview')
-rw-r--r-- | actionview/lib/action_view/helpers/form_options_helper.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/actionview/lib/action_view/helpers/form_options_helper.rb b/actionview/lib/action_view/helpers/form_options_helper.rb index a7747456a4..ad19426fff 100644 --- a/actionview/lib/action_view/helpers/form_options_helper.rb +++ b/actionview/lib/action_view/helpers/form_options_helper.rb @@ -566,9 +566,10 @@ module ActionView # an ActiveSupport::TimeZone. # # By default, +model+ is the ActiveSupport::TimeZone constant (which can - # be obtained in Active Record as a value object). The only requirement - # is that the +model+ parameter be an object that responds to +all+, and - # returns an array of objects that represent time zones. + # be obtained in Active Record as a value object). The +model+ parameter + # must respond to +all+ and return an array of objects that represent time + # zones; each object must respond to +name+. If a Regexp is given it will + # attempt to match the zones using the <code>=~<code> operator. # # NOTE: Only the option tags are returned, you have to wrap this call in # a regular HTML select tag. |