aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Expand)AuthorAgeFilesLines
* Add changlog entry for #10844Andrew White2013-09-301-0/+7
* Merge branch 'fix-ip-spoof-errors' of https://github.com/tamird/rails into ta...Andrew White2013-09-301-1/+1
|\
| * make sure both headers are set before checking for ip spoofingTamir Duberstein2013-06-041-1/+1
* | Merge pull request #12354 from kennyj/fix_12293Rafael Mendonça França2013-09-283-1/+26
|\ \
| * | Strong parameters should permit nested number as key. Closes #12293kennyj2013-09-273-1/+26
* | | Merge pull request #12398 from thedarkone/thread-safety-stuffRafael Mendonça França2013-09-282-13/+27
|\ \ \
| * | | Make GTG::TransTable thread safe.thedarkone2013-09-281-12/+23
| * | | Replace global Hash with TS::Cache.thedarkone2013-09-281-1/+4
* | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2013-09-281-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Fix link_to return valueEarl J St Sauver2013-09-221-1/+1
* | | | Merge pull request #12233 from claudiob/delete-actionpack-unused-fixtureYves Senn2013-09-271-5/+0
|\ \ \ \ | |_|/ / |/| | |
| * | | Remove HelperyTestHelper not used in any testclaudiob2013-09-141-5/+0
* | | | [ci skip] escape unintended url in docsChris Ciollaro2013-09-261-1/+1
* | | | No need the else clauseRafael Mendonça França2013-09-241-2/+0
* | | | Use join to concat the both side of the ASTRafael Mendonça França2013-09-241-1/+2
* | | | add test_scoped_root_as_nameSam Ruby2013-09-241-0/+13
* | | | Merge pull request #10773 from wangjohn/link_and_routing_optionsRafael Mendonça França2013-09-231-0/+13
|\ \ \ \
| * | | | Adding documentation to +polymorphic_url+wangjohn2013-06-132-2/+16
* | | | | Merge pull request #9155 from bogdan/route-formatterAndrew White2013-09-221-23/+23
|\ \ \ \ \
| * | | | | Rewrite journey routes formatter for performanceBogdan Gusiev2013-08-281-23/+23
* | | | | | [ci skip] Add some comment about downcase url encoded string.kennyj2013-09-221-0/+2
* | | | | | Fix regex used to find URI schemes in redirect_toDerek Prior2013-09-192-1/+6
* | | | | | Fix incorrect assert_redirected_to failure messageDerek Prior2013-09-194-34/+48
* | | | | | Merge pull request #12280 from kennyj/remove_1_8_compatJosé Valim2013-09-191-1/+1
|\ \ \ \ \ \
| * | | | | | Remove 1.8 compatible codekennyj2013-09-191-1/+1
* | | | | | | NullSessionHash#destroy should be a no-opJonathan Baudanza2013-09-182-0/+13
|/ / / / / /
* | | | | | Fix an issue where router can't recognize downcased url encoding path.kennyj2013-09-193-0/+11
* | | | | | Remove tzinfo dependency from Action PackErik Michaels-Ober2013-09-171-5/+4
| |_|/ / / |/| | | |
* | | | | Removing ActiveSupport::Concern, it's not neededAttila Domokos2013-09-131-2/+0
* | | | | Fixing comment typo in ActionController::BaseAttila Domokos2013-09-131-1/+1
* | | | | Merge pull request #12222 from rcillo/fix-custom-flashRafael Mendonça França2013-09-133-1/+20
|\ \ \ \ \
| * | | | | Custom flash should be defined only for the class that defines it and it's su...Ricardo de Cillo2013-09-133-1/+20
* | | | | | Merge pull request #12216 from suginoy/a-anRafael Mendonça França2013-09-132-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix typos: the indefinite articles(a -> an)SUGINO Yasuhiro2013-09-132-2/+2
* | | | | | Add CHANGELOG entry for #12149Rafael Mendonça França2013-09-121-0/+6
* | | | | | Merge pull request #12159 from nashby/issue-12149Rafael Mendonça França2013-09-122-1/+10
|\ \ \ \ \ \
| * | | | | | do not break params filtering on nil valuesVasiliy Ermolovich2013-09-072-1/+10
* | | | | | | Removed semicolon and added spaceAnupam Choudhury2013-09-131-2/+2
* | | | | | | Revert "Merge pull request #12208 from mjhoy/patch-1"Rafael Mendonça França2013-09-121-0/+4
| |_|_|_|/ / |/| | | | |
* | | | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2013-09-131-10/+10
|\ \ \ \ \ \
| * | | | | | Change documentation to consistently refer to the same objectEarl J St Sauver2013-09-081-8/+8
| * | | | | | Blacklist refferenced in docs is actually whitelistEarl J St Sauver2013-09-081-2/+2
* | | | | | | remove outdated docsMichael Hoy2013-09-121-4/+0
* | | | | | | Reset ActionView::Base.logger instead of AC::Base.loggerAkira Matsuda2013-09-101-1/+1
* | | | | | | Refactor handling of action normalizationMax Shytikov2013-09-101-11/+13
* | | | | | | Make AC standalone rendering workSantiago Pastorino2013-09-102-2/+20
* | | | | | | Remove helper fixtures not used in any testclaudiob2013-09-091-2/+0
* | | | | | | Remove BasicRendering testsJosé Valim2013-09-092-10/+1
* | | | | | | Remove remaining coupling with AV in MimeRespondsJosé Valim2013-09-093-5/+13
* | | | | | | Remove BasicRendering and remove template functionality from AbsC::RenderingJosé Valim2013-09-094-40/+19
| |/ / / / / |/| | | | |