aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
...
* | | 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
| | | | |
| * | | | Extract dependency tracking from DigestorDaniel Schierbeck2013-02-202-44/+73
| | | | |
* | | | | fix respond_to without blocks not working if one of the blocks is allgrosser2013-02-244-1/+25
| | | | |
* | | | | registers the encrypted session store in the AP changelogXavier Noria2013-02-231-0/+4
| | | | |
* | | | | Fix debug helper not inspecting on ExceptionBouke van der Bijl2013-02-231-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 ASCarlos Antonio da Silva2013-02-221-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 Silva2013-02-221-1/+1
| | | | |
* | | | | Address edge case for number_to_human with units option.hoffm2013-02-221-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_tagAndrew White2013-02-212-19/+21
|\ \ \ \ \ | | | | | | | | | | | | use ISO 8601 format in time_tag helper
| * | | | | document setting custom datetime attribute for time_tag helperNihad Abbasov2013-02-221-0/+2
| | | | | |
| * | | | | fix time_tag helper and update tests to not rely on dynamically generated valuesNihad Abbasov2013-02-222-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 Noria2013-02-212-15/+6
| | | | | |
* | | | | | tweaks to the AP changelog [ci skip]Xavier Noria2013-02-211-9/+3
| | | | | |
* | | | | | Merge pull request #9361 from senny/improved_match_shorthand_syntaxAndrew White2013-02-213-14/+53
|\ \ \ \ \ \ | | | | | | | | | | | | | | determine the match shorthand target early.
| * | | | | | determine the match shorthand target early.Yves Senn2013-02-213-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 Pastorino2013-02-213-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 6871bd9818a9a7d9d8c7e21e253d64c0410fde1d.
* | | | | | | This cache is not neededSantiago Pastorino2013-02-211-2/+1
| | | | | | |
* | | | | | | Use composition to figure out the forgery protection strategySantiago Pastorino2013-02-211-9/+27
| |_|_|_|_|/ |/| | | | |
* | | | | | Use #grep to filter priority zones when a regexp is givenCarlos Antonio da Silva2013-02-212-3/+5
| | | | | |
* | | | | | Use Array Difference to calculate the zones array, instead of iteratingCarlos Antonio da Silva2013-02-211-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 testCarlos Antonio da Silva2013-02-211-3/+3
| | | | | |
* | | | | | Remove not necessary changelog about time zone array mutationCarlos Antonio da Silva2013-02-211-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This seemed to be introduced in master by 9dd64f2e0c1b3ce85b503b0f81c50c93f89ffbcd, so there's no need to add a changelog entry for fixing it. [ci skip]
* | | | | | tweaks to the AP changelog [ci skip]Xavier Noria2013-02-211-42/+27
|/ / / / /
* | | | | Merge pull request #9354 from NARKOZ/remove-warningsSteve Klabnik2013-02-211-2/+2
|\ \ \ \ \ | | | | | | | | | | | | remove assigned but unused variables
| * | | | | remove assigned but unused variable warningNihad Abbasov2013-02-211-2/+2
| | | | | |
* | | | | | Rack::Test::UploadedFile is a permitted scalarFabio Kreusch2013-02-212-4/+6
|/ / / / /
* | / / / Revert "Merge pull request #4803 from lucascaton/master"Santiago Pastorino2013-02-203-5/+3
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit bb842e8d2111e50b21a14b8bd6d89371a4b9cd68, reversing changes made to 40c287c7983c20c498f6a8a2ea49e9a6455347f7. This was causing issues in one of our apps we just upgraded. ActionController::RoutingError: No route matches [GET] "/images/favicon.ico" favicon_link_tag now returns '/images/favicon.ico' and in 3.2 returned '/favicon.ico' Browsers by default look for favicon.ico in the root directory Conflicts: actionpack/CHANGELOG.md actionpack/lib/action_view/helpers/asset_tag_helper.rb