Carlos Antonio da Silva
c7ba4c7c98
Skip fetching path if the iteration is going to be skipped
2013-03-11 15:54:43 -03:00
Vipul A M
a0906da6b3
Change from each to each_value on hash to avoid unused variable warning
2013-03-11 00:26:23 +05:30
José Valim
6a18ec0a0d
Merge pull request #9626 from dasch/dasch/instrument-strong-params
...
Use AS::Notifications to instrument Strong Params
2013-03-09 12:35:23 -08:00
Yves Senn
a58e660837
Use "Fixes" in place of "Fix" in changelogs for consistency [ci skip].
2013-03-09 20:57:17 +01:00
Vijay Dev
b938f08a33
Merge branch 'master' of github.com:lifo/docrails
2013-03-10 00:09:26 +05:30
Sam Ruby
c41b768a78
ensure response.stream is closed
2013-03-09 12:08:37 -05:00
Olek Janiszewski
8e05a6f638
Fix incorrectly appended square brackets to a multiple select box
...
If an explicit name has been given and it already ends with "[]"
Before:
select(:category, [], {}, multiple: true, name: "post[category][]")
# => <select name="post[category][][]" ...>
After:
select(:category, [], {}, multiple: true, name: "post[category][]")
# => <select name="post[category][]" ...>
2013-03-08 19:01:32 +01:00
Carlos Antonio da Silva
b67043393b
Fix warnings
2013-03-07 21:32:51 -03:00
Carlos Antonio da Silva
087ce9d52d
Fix hash spaces and use 1.9 style hash [ci skip]
2013-03-07 20:17:30 -03:00
Carlos Antonio da Silva
a049631380
Move AP changelog entry to the top [ci skip]
2013-03-07 20:15:49 -03:00
Rafael Mendonça França
de4a60c9f4
Merge pull request #9464 from jcoyne/assert_template_file
...
Allow use of assert_template with the :file option.
2013-03-07 14:00:39 -08:00
Daniel Schierbeck
d552d8fa00
Use the instrumentation framework to instrument Strong Params
2013-03-07 10:41:05 +01:00
Rafael Mendonça França
bac37774cf
Merge pull request #9586 from robertomiranda/useless_tr
...
Change useless tr to gsub
2013-03-06 12:02:58 -08:00
Jess Brown
c5b5c68d52
Update capture_helper.rb
...
if there's content for the right column, then we need the two-column class, if not the one-column
2013-03-06 14:52:23 -05:00
robertomiranda
482b07643e
Change useless tr to gsub
2013-03-06 14:51:29 -05:00
RKushnir
1ffaa7aef6
Typo in comment to ActionView::Resolver#find_all
2013-03-06 15:20:09 +02:00
Carlos Antonio da Silva
ee169329a8
Add missing require to debug helper test
2013-03-05 22:00:10 -03:00
robertomiranda
8404925788
Add DebugHelperTest
2013-03-05 17:20:02 -05:00
robertomiranda
8a189d0104
Use gsub intead of tr when the to_str is longer than the from_str
2013-03-05 16:07:55 -05:00
robertomiranda
3bf961d7fd
change useless gsub to tr
2013-03-05 09:33:42 -05:00
Carlos Antonio da Silva
5cf472e043
Merge pull request #9561 from inossidabile/explicit_match_via_requirement_exception_message
...
Routing match `via` option requirement exception message made more explicit
2013-03-05 04:38:58 -08:00
Boris Staal
3ef641e095
Routing match via
option requirement exception message made more explicit
2013-03-05 19:27:02 +07:00
Benjamin Sullivan
c6147113fa
change useless gsub to delete
2013-03-05 17:32:37 +09:00
maximerety
1d217abc3d
Fix formats on xhr requests when HTTP_ACCEPT is empty string
...
Fix ActionDispatch::Request#formats on xhr requests when HTTP_ACCEPT
header is empty string. About issue #7774 , same fix as in commit bebb02f
but for xhr requests.
2013-03-04 14:43:31 +00:00
Andrew White
86cf7a2d16
Use custom visitor class for optimized url helpers
...
Rather than trying to use gsub to remove the optional route segments,
which will fail with nested optional segments, use a custom visitor
class that returns a empty string for group nodes.
Closes #9524
2013-03-03 19:18:01 +00:00
Justin Coyne
73deb3af23
Allow use of assert_template with the :file option.
...
This worked in Rails 3.2, but was a regression in 4.0.0.beta1
2013-03-01 07:22:38 -06:00
Rafael Mendonça França
c4f2f5b9d7
Improve the CHANGELOG entry
...
[ci skip]
2013-02-28 18:31:46 -03:00
Rafael Mendonça França
fae2e4d05d
Merge pull request #9366 from killthekitten/fix-content_for-regression
...
Fix for #9360 content_for regression
2013-02-28 13:28:50 -08:00
Carlos Antonio da Silva
a3894380eb
Minor changelog improvement [ci skip]
2013-02-28 08:41:53 -03:00
Andrew White
cf278a6eff
Remove redundant method
2013-02-28 03:37:52 +00:00
Yves Senn
afddc0409e
format: true
does not override existing format constraints.
...
Closes #9466 .
Passing `format: true` used to override the constraints: { format: /json/ }
with `/.+/`. This patch only sets the format if there is no constraint present.
2013-02-27 19:57:41 +01:00
José Valim
5c1354901e
Improve docs for AbsC::Rendering
2013-02-27 08:30:46 -07:00
Carlos Antonio da Silva
02037c3ea0
Merge pull request #9218 from Fivell/master
...
Fix calculation of db_runtime property in
ActiveRecord::Railties::ControllerRuntime#cleanup_view_runtime.
Previously, after raising ActionView::MissingTemplate, db_runtime was
not populated.
Closes #9218 , Fixes #9215 .
Conflicts:
activerecord/CHANGELOG.md
2013-02-27 11:47:24 -03:00
Igor
dd0bbd2ccb
fix db_runtime attribute value after raising ActionView::MissingTemplate exception
2013-02-27 16:35:22 +02:00
Yves Senn
a689482490
cleanup AP number_helpers_test
...
* use 1.9 style hash syntax
* don't use brances on assert_equal
* prefere " over '
2013-02-27 13:40:26 +01:00
Yves Senn
152f2f3d3c
remove duplicated number_helper tests in AP. They are already in AS.
...
With 155cd5e6 the number_helpers were moved into AS all the tests were copied over
but the tests in AP were not deleted. This is confusing.
I removed all duplicated tests and reorganized the tests in AP to only test the
functionality, that is added in AP.
2013-02-27 13:32:29 +01:00
Steve Klabnik
b080ad35a5
Merge pull request #9452 from frodsan/remove_private_attribute_warning
...
remove private attribute? warning
2013-02-26 16:08:00 -08:00
Francesco Rodriguez
16bd04f6bb
remove private attribute? warning
2013-02-26 18:56:56 -05:00
Yves Senn
794cbf3e38
allow non-String default params in the router.
...
Closes #9435 .
Skip valid encoding checks for non-String parameters that come
from the matched route's defaults.
2013-02-26 21:53:48 +01:00
Yves Senn
09d9f04d08
the router allows String contraints.
...
Closes #9432 .
2013-02-26 21:09:49 +01:00
Rafael Mendonça França
e24e086ef1
Move the CHANGELOG entry to the proper place
...
[ci skip]
2013-02-26 14:16:55 -03:00
Rafael Mendonça França
28bebb225f
Merge pull request #9434 from zires/dev
...
Journey::Path::Pattern#new raise more meaningful exception message.
2013-02-26 09:15:43 -08:00
zires
35f38b71df
Make ActionDispatch::Journey::Path::Pattern#new raise more meaningful exception message.
2013-02-27 08:26:51 +08:00
Rafael Mendonça França
3d9cfe09ad
Merge pull request #9444 from frodsan/add_test_for_977455cc
...
Add tests for #9441
2013-02-26 08:55:48 -08:00
Francesco Rodriguez
7487e79d4d
Add tests for #9441
2013-02-26 11:50:48 -05:00
Rafael Mendonça França
0f75e2c51f
Update CHANGELOGS
2013-02-26 13:45:57 -03:00
Vijay Dev
7184e3e02e
Merge branch 'master' of github.com:lifo/docrails
2013-02-26 21:53:38 +05:30
Sam Ruby
977455cc2e
Allow both a path and an option on root in config/routes
2013-02-26 09:51:35 -05:00
Nikolay Shebanov
371a5f2d73
Fix #9360 regression in content_for
2013-02-25 20:03:37 +04:00
David Heinemeier Hansson
c0bc9ce38c
Preparing for 4.0.0.beta1 release
2013-02-25 08:31:50 -06:00