Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | Fix hash spaces and use 1.9 style hash [ci skip] | Carlos Antonio da Silva | 2013-03-07 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Move AP changelog entry to the top [ci skip] | Carlos Antonio da Silva | 2013-03-07 | 1 | -6/+6 | |
| | | | | ||||||
* | | | | Merge pull request #9464 from jcoyne/assert_template_file | Rafael Mendonça França | 2013-03-07 | 5 | -2/+59 | |
|\ \ \ \ | | | | | | | | | | | Allow use of assert_template with the :file option. | |||||
| * | | | | Allow use of assert_template with the :file option. | Justin Coyne | 2013-03-01 | 5 | -2/+59 | |
| | | | | | | | | | | | | | | | | | | | | This worked in Rails 3.2, but was a regression in 4.0.0.beta1 | |||||
* | | | | | Merge pull request #9586 from robertomiranda/useless_tr | Rafael Mendonça França | 2013-03-06 | 1 | -2/+2 | |
|\ \ \ \ \ | | | | | | | | | | | | | Change useless tr to gsub | |||||
| * | | | | | Change useless tr to gsub | robertomiranda | 2013-03-06 | 1 | -2/+2 | |
| | | | | | | ||||||
* | | | | | | Typo in comment to ActionView::Resolver#find_all | RKushnir | 2013-03-06 | 1 | -1/+1 | |
| |_|_|/ / |/| | | | | ||||||
* | | | | | Add missing require to debug helper test | Carlos Antonio da Silva | 2013-03-05 | 1 | -2/+2 | |
|/ / / / | ||||||
* | | | | Add DebugHelperTest | robertomiranda | 2013-03-05 | 1 | -0/+8 | |
| | | | | ||||||
* | | | | Use gsub intead of tr when the to_str is longer than the from_str | robertomiranda | 2013-03-05 | 1 | -1/+1 | |
| |/ / |/| | | ||||||
* | | | change useless gsub to tr | robertomiranda | 2013-03-05 | 4 | -5/+5 | |
| | | | ||||||
* | | | Merge pull request #9561 from ↵ | Carlos Antonio da Silva | 2013-03-05 | 1 | -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 explicit | Boris Staal | 2013-03-05 | 1 | -1/+2 | |
| | | | | ||||||
* | | | | change useless gsub to delete | Benjamin Sullivan | 2013-03-05 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | Fix formats on xhr requests when HTTP_ACCEPT is empty string | maximerety | 2013-03-04 | 2 | -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 helpers | Andrew White | 2013-03-03 | 4 | -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 entry | Rafael Mendonça França | 2013-02-28 | 1 | -2/+6 | |
| | | | | | | | | [ci skip] | |||||
* | | Merge pull request #9366 from killthekitten/fix-content_for-regression | Rafael Mendonça França | 2013-02-28 | 3 | -1/+7 | |
|\ \ | | | | | | | Fix for #9360 content_for regression | |||||
| * | | Fix #9360 regression in content_for | Nikolay Shebanov | 2013-02-25 | 3 | -1/+7 | |
| | | | ||||||
* | | | Minor changelog improvement [ci skip] | Carlos Antonio da Silva | 2013-02-28 | 1 | -1/+1 | |
| | | | ||||||
* | | | Remove redundant method | Andrew White | 2013-02-28 | 1 | -8/+0 | |
| | | | ||||||
* | | | `format: true` does not override existing format constraints. | Yves Senn | 2013-02-27 | 3 | -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::Rendering | José Valim | 2013-02-27 | 1 | -3/+11 | |
| | | | ||||||
* | | | Merge pull request #9218 from Fivell/master | Carlos Antonio da Silva | 2013-02-27 | 1 | -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 ↵ | Igor | 2013-02-27 | 1 | -0/+14 | |
| | | | | | | | | | | | | | | | | exception | |||||
* | | | | cleanup AP number_helpers_test | Yves Senn | 2013-02-27 | 1 | -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 Senn | 2013-02-27 | 1 | -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_warning | Steve Klabnik | 2013-02-26 | 1 | -1/+3 | |
|\ \ \ \ | | | | | | | | | | | remove private attribute? warning | |||||
| * | | | | remove private attribute? warning | Francesco Rodriguez | 2013-02-26 | 1 | -1/+3 | |
| | | | | | ||||||
* | | | | | allow non-String default params in the router. | Yves Senn | 2013-02-26 | 3 | -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 Senn | 2013-02-26 | 3 | -12/+62 | |
| | | | | | | | | | | | | | | | | | | | | Closes #9432. | |||||
* | | | | | Move the CHANGELOG entry to the proper place | Rafael Mendonça França | 2013-02-26 | 1 | -2/+4 | |
| | | | | | | | | | | | | | | | | | | | | [ci skip] | |||||
* | | | | | Merge pull request #9434 from zires/dev | Rafael Mendonça França | 2013-02-26 | 3 | -1/+7 | |
|\ \ \ \ \ | |/ / / / |/| | | | | Journey::Path::Pattern#new raise more meaningful exception message. | |||||
| * | | | | Make ActionDispatch::Journey::Path::Pattern#new raise more meaningful ↵ | zires | 2013-02-27 | 3 | -1/+7 | |
| | | | | | | | | | | | | | | | | | | | | exception message. | |||||
* | | | | | Merge pull request #9444 from frodsan/add_test_for_977455cc | Rafael Mendonça França | 2013-02-26 | 1 | -0/+16 | |
|\ \ \ \ \ | | | | | | | | | | | | | Add tests for #9441 | |||||
| * | | | | | Add tests for #9441 | Francesco Rodriguez | 2013-02-26 | 1 | -0/+16 | |
| | | | | | | ||||||
* | | | | | | Update CHANGELOGS | Rafael Mendonça França | 2013-02-26 | 1 | -0/+3 | |
| | | | | | | ||||||
* | | | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2013-02-26 | 2 | -2/+2 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Typo fix. | Carson McDonald | 2013-02-21 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | improve grammar describing ActionDispatch::Cookies::CookieJar#delete | Weston Platter | 2013-02-19 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | improve grammar describing ActionDispatch::Cookies::CookieJar#delete | Weston Platter | 2013-02-19 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | Allow both a path and an option on root in config/routes | Sam Ruby | 2013-02-26 | 1 | -2/+9 | |
| |/ / / / |/| | | | | ||||||
* | | | | | Preparing for 4.0.0.beta1 release | David Heinemeier Hansson | 2013-02-25 | 2 | -2/+2 | |
| | | | | | ||||||
* | | | | | Merge pull request #8530 from dasch/dependency-trackers | David Heinemeier Hansson | 2013-02-25 | 4 | -45/+146 | |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | Custom dependency trackers for the template digestor | |||||
| * | | | | Register trackers on extensions, not handlers | Daniel Schierbeck | 2013-02-20 | 3 | -11/+17 | |
| | | | | | ||||||
| * | | | | Rename ErbTracker to ERBTracker | Daniel Schierbeck | 2013-02-20 | 1 | -2/+2 | |
| | | | | | ||||||
| * | | | | Return an empty array if no tracker is found | Daniel Schierbeck | 2013-02-20 | 2 | -4/+16 | |
| | | | | | ||||||
| * | | | | Use a thread safe hash | Daniel Schierbeck | 2013-02-20 | 1 | -1/+3 | |
| | | | | | ||||||
| * | | | | Allow registering custom dependency trackers | Daniel Schierbeck | 2013-02-20 | 3 | -2/+54 | |
| | | | | | ||||||
| * | | | | Extract dependency tracking from Digestor | Daniel Schierbeck | 2013-02-20 | 2 | -44/+73 | |
| | | | | |