aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Expand)AuthorAgeFilesLines
...
| * Updates to make rails 4 happy with minitest 5:Ryan Davis2013-05-061-1/+3
* | Revert "Integration tests support the OPTIONS http method"Rafael Mendonça França2013-05-162-24/+2
* | Merge pull request #10636 from seanwalbran/fix-asset-host-proc-returning-nilRafael Mendonça França2013-05-162-1/+13
|\ \
| * | restore ability to return nil from asset_host proc, add testSean Walbran2013-05-152-1/+13
* | | Revert "Add the options method to action_controller testcase."Rafael Mendonça França2013-05-162-11/+0
* | | Merge pull request #10591 from acapilleri/cond_callback_testAaron Patterson2013-05-151-0/+13
|\ \ \ | |/ / |/| |
| * | add test for skip_before_filter with conditionAngelo capilleri2013-05-131-0/+13
* | | deprecating string based terminatorsAaron Patterson2013-05-141-1/+3
* | | inspect the filter when displaying error messagesAaron Patterson2013-05-141-1/+1
* | | use public api for testing rather than grabbing instance variablesAaron Patterson2013-05-141-1/+1
* | | Fixing build broken by this changeArun Agrawal2013-05-131-2/+2
|/ /
* | Code cleanup for ActionDispatch::Flash#callJulian Vargas2013-05-121-9/+3
* | Replace multi_json with jsonErik Michaels-Ober2013-05-111-1/+1
* | Merge pull request #10543 from vipulnsward/to_sortCarlos Antonio da Silva2013-05-101-1/+1
|\ \
| * | sort => sort! on new arrayVipul A M2013-05-101-1/+1
* | | Merge pull request #10510 from think602/masterXavier Noria2013-05-091-0/+1
|\ \ \ | |/ / |/| |
| * | [ci skip] document protect_against_forgery? methodWeston Platter2013-05-101-0/+1
* | | Merge pull request #10536 from vipulnsward/fix_exp_warningCarlos Antonio da Silva2013-05-091-1/+0
|\ \ \
| * | | remove variable and fix warningVipul A M2013-05-091-1/+0
* | | | rails -> Rails [ci skip]Prathamesh Sonpatki2013-05-091-1/+1
|/ / /
* / / Fix that JSON and XML exception responses should give the HTTP error message ...Jeremy Kemper2013-05-082-4/+4
|/ /
* | Test that #fresh_when accepts an arrayBrandon Keepers2013-05-071-2/+19
* | Merge pull request #10377 from bricker/template_digest_ending_with_numberRafael Mendonça França2013-05-064-3/+12
|\ \
| * | Allow numbers in partial name for digestingBryan Ricker2013-05-064-3/+12
* | | Merge pull request #10446 from dasch/instrument-template-compilationRafael Mendonça França2013-05-061-2/+9
|\ \ \ | |/ / |/| |
| * | Instrument template compilationDaniel Schierbeck2013-05-061-2/+9
* | | Merge pull request #10478 from cainlevy/patch-1Rafael Mendonça França2013-05-061-1/+1
|\ \ \ | |_|/ |/| |
| * | use canonical #controller_path logic in controller test casesLance Ivy2013-05-051-1/+1
* | | remove unused variableVipul A M2013-05-061-1/+0
* | | Fix typo in documentation commentJunya Ogura2013-05-061-1/+1
|/ /
* | Added missing `require` to ActionView::LookupContextVladimir Strakhov2013-05-051-0/+1
* | Fix generating route from engine to other enginePiotr Sarnacki2013-05-031-1/+2
|/
* Merge pull request #10426 from tkrajcar/rescue-h1-fixCarlos Antonio da Silva2013-05-021-0/+6
|\
| * Add styling to h1Tim Krajcar2013-05-021-0/+6
* | use constant for encodingNihad Abbasov2013-05-021-1/+1
|/
* Fix failing AP testCarlos Antonio da Silva2013-05-011-1/+1
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-05-011-1/+1
|\
| * fixed typo in select_tag docsRncrtr2013-04-181-1/+1
* | Merge pull request #9857 from yyyc514/bad_params_should_400Aaron Patterson2013-04-303-0/+8
|\ \
| * | failure to parse params should trigger a 400 Bad RequestJosh Goebel2013-03-213-0/+8
* | | add missing semicolon to journey parser.yBen Holley2013-04-301-0/+1
* | | Rack::Mount was replaced by Journey, Fixed commentGaurish Sharma2013-04-301-1/+1
* | | rails/master is now 4.1.0.betaRafael Mendonça França2013-04-292-1193/+3
* | | Bump version to rc1David Heinemeier Hansson2013-04-291-1/+1
* | | Don't reprocess the options hash on every requestAndrew White2013-04-271-1/+2
* | | Revert "Merge pull request #10337 from eimermusic/fix_template_digestor_lookup"Rafael Mendonça França2013-04-253-11/+2
* | | Merge pull request #10337 from eimermusic/fix_template_digestor_lookupRafael Mendonça França2013-04-253-2/+11
|\ \ \
| * | | AV Digestor correctly passes format to LookupContextMartin Westin2013-04-253-2/+11
* | | | Add support for extra options to `force_ssl`Andrew White2013-04-253-31/+159
* | | | Use `request.fullpath` to build redirect url in `force_ssl`Andrew White2013-04-253-4/+79
|/ / /