diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2012-03-27 16:15:21 -0700 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2012-03-27 16:15:21 -0700 |
commit | 460d2c7c28928ab0d880675c3a7a74e81605e835 (patch) | |
tree | 2083c7e91e7e34ad28441b255744262418ba37e3 /actionpack/test/controller/url_rewriter_test.rb | |
parent | d82e4c80a820280c8bb9957bd86453d8fea49384 (diff) | |
parent | 6968bc16a1a609c56cf056cd9cd8f8de251defde (diff) | |
download | rails-460d2c7c28928ab0d880675c3a7a74e81605e835.tar.gz rails-460d2c7c28928ab0d880675c3a7a74e81605e835.tar.bz2 rails-460d2c7c28928ab0d880675c3a7a74e81605e835.zip |
Merge pull request #5622 from rafaelfranca/fix-2492-3-2
[3-2-stable] Fix label_tag to merge the options hash with the object hash
Diffstat (limited to 'actionpack/test/controller/url_rewriter_test.rb')
0 files changed, 0 insertions, 0 deletions