aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* Fix warningsCarlos Antonio da Silva2013-03-071-2/+2
|
* Fix hash spaces and use 1.9 style hash [ci skip]Carlos Antonio da Silva2013-03-071-1/+1
|
* Move AP changelog entry to the top [ci skip]Carlos Antonio da Silva2013-03-071-6/+6
|
* Merge pull request #9464 from jcoyne/assert_template_fileRafael Mendonça França2013-03-075-2/+59
|\ | | | | Allow use of assert_template with the :file option.
| * Allow use of assert_template with the :file option.Justin Coyne2013-03-015-2/+59
| | | | | | | | This worked in Rails 3.2, but was a regression in 4.0.0.beta1
* | Merge pull request #9586 from robertomiranda/useless_trRafael Mendonça França2013-03-061-2/+2
|\ \ | | | | | | Change useless tr to gsub
| * | Change useless tr to gsubrobertomiranda2013-03-061-2/+2
| | |
* | | Typo in comment to ActionView::Resolver#find_allRKushnir2013-03-061-1/+1
| | |
* | | Add missing require to debug helper testCarlos Antonio da Silva2013-03-051-2/+2
|/ /
* | Add DebugHelperTestrobertomiranda2013-03-051-0/+8
| |
* | Use gsub intead of tr when the to_str is longer than the from_strrobertomiranda2013-03-051-1/+1
| |
* | change useless gsub to trrobertomiranda2013-03-054-5/+5
| |
* | Merge pull request #9561 from ↵Carlos Antonio da Silva2013-03-051-1/+2
|\ \ | | | | | | | | | | | | inossidabile/explicit_match_via_requirement_exception_message Routing match `via` option requirement exception message made more explicit
| * | Routing match `via` option requirement exception message made more explicitBoris Staal2013-03-051-1/+2
| | |
* | | change useless gsub to deleteBenjamin Sullivan2013-03-051-1/+1
|/ /
* | Fix formats on xhr requests when HTTP_ACCEPT is empty stringmaximerety2013-03-042-1/+6
| | | | | | | | | | | | 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.
* | Use custom visitor class for optimized url helpersAndrew White2013-03-034-9/+19
|/ | | | | | | | 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
* Improve the CHANGELOG entryRafael Mendonça França2013-02-281-2/+6
| | | | [ci skip]
* Merge pull request #9366 from killthekitten/fix-content_for-regressionRafael Mendonça França2013-02-283-1/+7
|\ | | | | Fix for #9360 content_for regression
| * Fix #9360 regression in content_forNikolay Shebanov2013-02-253-1/+7
| |
* | Minor changelog improvement [ci skip]Carlos Antonio da Silva2013-02-281-1/+1
| |
* | Remove redundant methodAndrew White2013-02-281-8/+0
| |
* | `format: true` does not override existing format constraints.Yves Senn2013-02-273-1/+35
| | | | | | | | | | | | | | 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.
* | Improve docs for AbsC::RenderingJosé Valim2013-02-271-3/+11
| |
* | Merge pull request #9218 from Fivell/masterCarlos Antonio da Silva2013-02-271-0/+14
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | fix db_runtime attribute value after raising ActionView::MissingTemplate ↵Igor2013-02-271-0/+14
| | | | | | | | | | | | exception
* | | cleanup AP number_helpers_testYves Senn2013-02-271-47/+47
| | | | | | | | | | | | | | | | | | * use 1.9 style hash syntax * don't use brances on assert_equal * prefere " over '
* | | remove duplicated number_helper tests in AP. They are already in AS.Yves Senn2013-02-271-270/+22
| | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Merge pull request #9452 from frodsan/remove_private_attribute_warningSteve Klabnik2013-02-261-1/+3
|\ \ \ | | | | | | | | remove private attribute? warning
| * | | remove private attribute? warningFrancesco Rodriguez2013-02-261-1/+3
| | | |
* | | | allow non-String default params in the router.Yves Senn2013-02-263-1/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #9435. Skip valid encoding checks for non-String parameters that come from the matched route's defaults.
* | | | the router allows String contraints.Yves Senn2013-02-263-12/+62
| | | | | | | | | | | | | | | | Closes #9432.
* | | | Move the CHANGELOG entry to the proper placeRafael Mendonça França2013-02-261-2/+4
| | | | | | | | | | | | | | | | [ci skip]
* | | | Merge pull request #9434 from zires/devRafael Mendonça França2013-02-263-1/+7
|\ \ \ \ | |/ / / |/| | | Journey::Path::Pattern#new raise more meaningful exception message.
| * | | Make ActionDispatch::Journey::Path::Pattern#new raise more meaningful ↵zires2013-02-273-1/+7
| | | | | | | | | | | | | | | | exception message.
* | | | Merge pull request #9444 from frodsan/add_test_for_977455ccRafael Mendonça França2013-02-261-0/+16
|\ \ \ \ | | | | | | | | | | Add tests for #9441
| * | | | Add tests for #9441Francesco Rodriguez2013-02-261-0/+16
| | | | |
* | | | | Update CHANGELOGSRafael Mendonça França2013-02-261-0/+3
| | | | |
* | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-02-262-2/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Typo fix.Carson McDonald2013-02-211-1/+1
| | | | |
| * | | | improve grammar describing ActionDispatch::Cookies::CookieJar#deleteWeston Platter2013-02-191-1/+1
| | | | |
| * | | | improve grammar describing ActionDispatch::Cookies::CookieJar#deleteWeston Platter2013-02-191-1/+1
| | | | |
* | | | | Allow both a path and an option on root in config/routesSam Ruby2013-02-261-2/+9
| |/ / / |/| | |
* | | | Preparing for 4.0.0.beta1 releaseDavid Heinemeier Hansson2013-02-252-2/+2
| | | |
* | | | Merge pull request #8530 from dasch/dependency-trackersDavid Heinemeier Hansson2013-02-254-45/+146
|\ \ \ \ | | | | | | | | | | Custom dependency trackers for the template digestor
| * | | | Register trackers on extensions, not handlersDaniel Schierbeck2013-02-203-11/+17
| | | | |
| * | | | Rename ErbTracker to ERBTrackerDaniel Schierbeck2013-02-201-2/+2
| | | | |
| * | | | Return an empty array if no tracker is foundDaniel Schierbeck2013-02-202-4/+16
| | | | |
| * | | | Use a thread safe hashDaniel Schierbeck2013-02-201-1/+3
| | | | |
| * | | | Allow registering custom dependency trackersDaniel Schierbeck2013-02-203-2/+54
| | | | |