aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | Merge pull request #9680 from bdmac/time-zone-options-revert-grep-to-selectCarlos Antonio da Silva2013-03-312-4/+23
|\ \ \ \ \ \ \
| * | | | | | | Add regression test for TZ grepBrian McManus2013-03-271-0/+20
| * | | | | | | Revert grep to select since they are not the sameBrian McManus2013-03-272-4/+3
* | | | | | | | Merge pull request #10013 from vipulnsward/fix_request_method_testSantiago Pastorino2013-03-311-6/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | fix request methods testVipul A M2013-03-311-6/+2
* | | | | | | | | Merge pull request #10015 from vipulnsward/remove_unused_variable_in_getSteve Klabnik2013-03-312-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | remove unused variable and assignmentVipul A M2013-03-312-2/+2
| |/ / / / / / / /
* | | | | | | | | Merge pull request #10014 from vipulnsward/remove_unused_match_varSteve Klabnik2013-03-311-8/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | remove unused match variables in selectorVipul A M2013-03-311-8/+8
| |/ / / / / / / /
* / / / / / / / / fix wrong argument error messageVipul A M2013-03-311-1/+1
|/ / / / / / / /
* | | | | | | | Improve AP changelog entry about layout method with nil returnCarlos Antonio da Silva2013-03-301-4/+4
* | | | | | | | Fix typos in AP: "overriden" => "overridden"Carlos Antonio da Silva2013-03-305-36/+36
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-03-306-84/+32
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Fix typoCarson McDonald2013-03-261-1/+1
| * | | | | | Reverted code change introduced in d45145acdc576e46a1f1719d69bec96b5bf07b0aPrathamesh Sonpatki2013-03-242-2/+2
| * | | | | | Changed 'args' to 'arguments' when used in places other than code with fixing...Prathamesh Sonpatki2013-03-242-2/+2
| * | | | | | Remove duplicated accepts_nested_attributes descriptionma2gedev2013-03-221-16/+0
| * | | | | | Undo bad change in cf0931166be13dbbe660Steve Klabnik2013-03-191-1/+1
| * | | | | | Fixed small typosPrathamesh Sonpatki2013-03-192-2/+2
| * | | | | | The HTTP method helpers are preferred over match and should be explained befo...Trevor Turk2013-03-181-28/+16
| * | | | | | The default route has been removedTrevor Turk2013-03-181-24/+0
| * | | | | | Using match without via is deprecatedTrevor Turk2013-03-181-12/+12
| * | | | | | Capitalize the first letter of sentenceTatsuro Baba2013-03-181-1/+1
| * | | | | | Remove :all from *args options in AbstractController.helperBryan Ricker2013-03-161-1/+1
* | | | | | | Removed unused variable in procPrathamesh Sonpatki2013-03-281-1/+1
* | | | | | | Merge pull request #9967 from choudhuryanupam/fix_actionpack_test_casesCarlos Antonio da Silva2013-03-282-3/+3
|\ \ \ \ \ \ \
| * | | | | | | Refactored to remove unused variableAnupam Choudhury2013-03-282-3/+3
| | |/ / / / / | |/| | | | |
* / | | | | | Fixed grammarAnupam Choudhury2013-03-281-1/+1
|/ / / / / /
* | | | | | Merge pull request #8458 from lucisferre/improve-layout-override-fallback-beh...Rafael Mendonça França2013-03-274-5/+68
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Provides standard layout lookup behavior for method and proc casesChris Nicola2013-03-274-5/+67
* | | | | | Bump TZInfo version to 0.3.37 based on version v2013b of the underlying tz data.kennyj2013-03-261-1/+1
* | | | | | Merge pull request #9874 from arunagw/skipping-test-for-openssl-pkcs5Rafael Mendonça França2013-03-251-0/+10
|\ \ \ \ \ \
| * | | | | | Skipping test for OpenSSL::PKCS5 JRubyArun Agrawal2013-03-251-0/+10
* | | | | | | if cookie is tampered with then nil is returned [ci skip]Neeraj Singh2013-03-251-4/+2
|/ / / / / /
* | | | | | Update tests for #9704, named route collisionsJeremy Kemper2013-03-242-6/+7
* | | | | | Tender love for #9909 :heart:Jeremy Kemper2013-03-241-1/+1
* | | | | | Introduce UpgradeLegacySignedCookieJar to transparently upgrade existing sign...Trevor Turk2013-03-243-99/+159
* | | | | | Merge pull request #9704 from trevorturk/warn-about-skipped-routesJeremy Kemper2013-03-243-20/+31
|\ \ \ \ \ \
| * | | | | | Tweak exception message to avoid giving potentially misleading suggestionsTrevor Turk2013-03-201-2/+3
| * | | | | | Raise an ArgumentError when a clashing named route is definedTrevor Turk2013-03-193-20/+30
* | | | | | | Fix some typosVipul A M2013-03-242-2/+2
* | | | | | | Merge pull request #8501 from charliesome/version-to-sRafael Mendonça França2013-03-231-6/+7
|\ \ \ \ \ \ \
| * | | | | | | Add version method to top level modulesCharlie Somerville2013-03-211-6/+7
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Changed 'args' to 'arguments' in test descriptionPrathamesh Sonpatki2013-03-242-2/+2
* | | | | | | Fix documentation markup [ci skip]Rafael Mendonça França2013-03-231-0/+2
* | | | | | | StringIO is not required by default in JRubyArun Agrawal2013-03-221-0/+1
|/ / / / / /
* | | | | | Merge pull request #9802 from newsline/fix-broken-action-missingRafael Mendonça França2013-03-202-1/+13
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix broken ActionController#action_missingJanko Luin2013-03-203-1/+18
* | | | | | Merge pull request #9794 from schneems/schneems/email-hostAndrew White2013-03-193-1/+26
|\ \ \ \ \ \
| * | | | | | Fix improperly configured host in generated urlsschneems2013-03-193-1/+26
| |/ / / / /