Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | 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 | |
| | | | | | ||||||
* | | | | | fix respond_to without blocks not working if one of the blocks is all | grosser | 2013-02-24 | 4 | -1/+25 | |
| | | | | | ||||||
* | | | | | registers the encrypted session store in the AP changelog | Xavier Noria | 2013-02-23 | 1 | -0/+4 | |
| | | | | | ||||||
* | | | | | Fix debug helper not inspecting on Exception | Bouke van der Bijl | 2013-02-23 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | The debug helper should inspect the object when it can't be converted to YAML, this behavior was changed in 8f8d8eb1465069e2ed9b6f2404aa9d02e785f534. | |||||
* | | | | | Move number_to_human test from AP to AS | Carlos Antonio da Silva | 2013-02-22 | 1 | -5/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Since all changes from #9347 are related to AS, it seems proper that the test is placed there as well. | |||||
* | | | | | Changelog improvements, use 1.9 style hash in examples [ci skip] | Carlos Antonio da Silva | 2013-02-22 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | Address edge case for number_to_human with units option. | hoffm | 2013-02-22 | 1 | -0/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActiveSupport::NumberHelper#number_to_human now returns the number unaltered when the units hash does not contain the needed key, e.g. when the number provided is less than the largest key provided. | |||||
* | | | | | Merge pull request #9334 from NARKOZ/time_tag | Andrew White | 2013-02-21 | 2 | -19/+21 | |
|\ \ \ \ \ | | | | | | | | | | | | | use ISO 8601 format in time_tag helper | |||||
| * | | | | | document setting custom datetime attribute for time_tag helper | Nihad Abbasov | 2013-02-22 | 1 | -0/+2 | |
| | | | | | | ||||||
| * | | | | | fix time_tag helper and update tests to not rely on dynamically generated values | Nihad Abbasov | 2013-02-22 | 2 | -19/+19 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before `time_tag Date.today` will return `<time datetime="2013-02-14T00:00:00+00:00">February 14, 2013</time>`. This commit fixes time_tag helper to use RFC-3339 full-date format (Y-m-d) in datetime attribute. | |||||
* | | | | | | completes pass over the AP changelog [ci skip] | Xavier Noria | 2013-02-21 | 2 | -15/+6 | |
| | | | | | | ||||||
* | | | | | | tweaks to the AP changelog [ci skip] | Xavier Noria | 2013-02-21 | 1 | -9/+3 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #9361 from senny/improved_match_shorthand_syntax | Andrew White | 2013-02-21 | 3 | -14/+53 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | determine the match shorthand target early. | |||||
| * | | | | | | determine the match shorthand target early. | Yves Senn | 2013-02-21 | 3 | -14/+53 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #7554. This patch determines the `controller#action` directly in the `match` method when the shorthand syntax is used. this prevents problems with namespaces and scopes. | |||||
* | | | | | | | Revert "Revert "Merge pull request #4803 from lucascaton/master"" | Santiago Pastorino | 2013-02-21 | 3 | -3/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 6871bd9818a9a7d9d8c7e21e253d64c0410fde1d. | |||||
* | | | | | | | This cache is not needed | Santiago Pastorino | 2013-02-21 | 1 | -2/+1 | |
| | | | | | | | ||||||
* | | | | | | | Use composition to figure out the forgery protection strategy | Santiago Pastorino | 2013-02-21 | 1 | -9/+27 | |
| |_|_|_|_|/ |/| | | | | | ||||||
* | | | | | | Use #grep to filter priority zones when a regexp is given | Carlos Antonio da Silva | 2013-02-21 | 2 | -3/+5 | |
| | | | | | | ||||||
* | | | | | | Use Array Difference to calculate the zones array, instead of iterating | Carlos Antonio da Silva | 2013-02-21 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | It's faster, and doesn't force us to dup the timezones array. | |||||
* | | | | | | Fix test name and refactor fake timezones creation in form options test | Carlos Antonio da Silva | 2013-02-21 | 1 | -3/+3 | |
| | | | | | |