aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Expand)AuthorAgeFilesLines
* Improve the CHANGELOG entryRafael Mendonça França2013-02-281-2/+6
* Merge pull request #9366 from killthekitten/fix-content_for-regressionRafael Mendonça França2013-02-283-1/+7
|\
| * 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
* | 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 db_runtime attribute value after raising ActionView::MissingTemplate exc...Igor2013-02-271-0/+14
* | | cleanup AP number_helpers_testYves Senn2013-02-271-47/+47
* | | remove duplicated number_helper tests in AP. They are already in AS.Yves Senn2013-02-271-270/+22
* | | Merge pull request #9452 from frodsan/remove_private_attribute_warningSteve Klabnik2013-02-261-1/+3
|\ \ \
| * | | remove private attribute? warningFrancesco Rodriguez2013-02-261-1/+3
* | | | allow non-String default params in the router.Yves Senn2013-02-263-1/+33
* | | | the router allows String contraints.Yves Senn2013-02-263-12/+62
* | | | Move the CHANGELOG entry to the proper placeRafael Mendonça França2013-02-261-2/+4
* | | | Merge pull request #9434 from zires/devRafael Mendonça França2013-02-263-1/+7
|\ \ \ \ | |/ / / |/| | |
| * | | Make ActionDispatch::Journey::Path::Pattern#new raise more meaningful excepti...zires2013-02-273-1/+7
* | | | Merge pull request #9444 from frodsan/add_test_for_977455ccRafael Mendonça França2013-02-261-0/+16
|\ \ \ \
| * | | | 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
|\ \ \ \
| * | | | 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
* | | | | Move number_to_human test from AP to ASCarlos Antonio da Silva2013-02-221-5/+0
* | | | | 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
* | | | | Merge pull request #9334 from NARKOZ/time_tagAndrew White2013-02-212-19/+21
|\ \ \ \ \
| * | | | | 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
* | | | | | 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.Yves Senn2013-02-213-14/+53
* | | | | | | Revert "Revert "Merge pull request #4803 from lucascaton/master""Santiago Pastorino2013-02-213-3/+5
* | | | | | | This cache is not neededSantiago Pastorino2013-02-211-2/+1
* | | | | | | Use composition to figure out the forgery protection strategySantiago Pastorino2013-02-211-9/+27
| |_|_|_|_|/ |/| | | | |