diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-12-06 17:05:59 -0200 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-12-06 17:05:59 -0200 |
| commit | a220b1518dc6785e4d66437ec7362f7b8f5506e7 (patch) | |
| tree | 15a44a47fddf91e47eeee1b9fd25466cdceac220 /actionview/lib/action_view | |
| parent | 12544f9422958117c5c7ed715d938eb5257d2505 (diff) | |
| parent | 1eaa521273399d789565af1933a0e6e4462511a4 (diff) | |
| download | rails-a220b1518dc6785e4d66437ec7362f7b8f5506e7.tar.gz rails-a220b1518dc6785e4d66437ec7362f7b8f5506e7.tar.bz2 rails-a220b1518dc6785e4d66437ec7362f7b8f5506e7.zip | |
Merge pull request #13059 from imkmf/cycle-accepts-array
Cycle object should accept an array
Conflicts:
actionview/CHANGELOG.md
Diffstat (limited to 'actionview/lib/action_view')
| -rw-r--r-- | actionview/lib/action_view/helpers/text_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionview/lib/action_view/helpers/text_helper.rb b/actionview/lib/action_view/helpers/text_helper.rb index 3478eadbf2..9943e19714 100644 --- a/actionview/lib/action_view/helpers/text_helper.rb +++ b/actionview/lib/action_view/helpers/text_helper.rb @@ -316,7 +316,7 @@ module ActionView options = values.extract_options! name = options.fetch(:name, 'default') - values.unshift(first_value) + values.unshift(*first_value) cycle = get_cycle(name) unless cycle && cycle.values == values |