aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
Commit message (Expand)AuthorAgeFilesLines
...
* | | | Merge pull request #2321 from omjokine/masterJosé Valim2012-04-291-1/+4
|\ \ \ \
| * \ \ \ Merge remote-tracking branch 'upstream/master'Olli Jokinen2011-12-0129-102/+134
| |\ \ \ \
| * | | | | Change mimetype to Mime::JS if JSONP is usedOlli Jokinen2011-07-281-1/+4
* | | | | | Merge session arg with existing session instead of overwritingAndrew White2012-04-281-1/+1
| |_|_|/ / |/| | | |
* | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-04-282-4/+4
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Use <tt>Foo::Bar</tt> instead of +Foo::Bar+Mark Rushakof2012-04-272-4/+4
* | | | | remove unnecessary else statementVasiliy Ermolovich2012-04-261-3/+3
|/ / / /
* | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-04-181-1/+1
|\ \ \ \
| * | | | Fix HTML sanitizer allowed_css_properties commentAlexey Vakhov2012-04-131-1/+1
* | | | | Remove obsolete codeAlexey Vakhov2012-04-121-3/+0
* | | | | #send_file leans on Rack::Sendfile to X-Accel-Redirect the file's path, so op...Jeremy Kemper2012-04-121-1/+21
|/ / / /
* | | | Merge pull request #5748 from ai/no_type_in_html5Jeremy Kemper2012-04-081-1/+1
|\ \ \ \
| * | | | Remove unnecessary in HTML 5 type attribute with default valueAndrey A.I. Sitnik2012-04-051-1/+1
* | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-04-051-0/+1
|\ \ \ \ \
| * | | | | Add AC record identifier example with not-persisted objectAlexey Vakhov2012-04-051-0/+1
* | | | | | Merge pull request #4446 from ayamomiji/patch-1José Valim2012-04-051-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | prevent the cache sweeper ignores NoMethodErrorayaya2012-03-291-1/+1
* | | | | | Merge pull request #5716 from jurriaan/tr-gsub-cleanupSantiago Pastorino2012-04-043-3/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Updated/changed useless tr/gsubsJurriaan Pruis2012-04-033-3/+3
* | | | | | Fix AC responder exampleAlexey Vakhov2012-04-041-1/+1
* | | | | | Remove non-obligatory params in AC respond_to examplesAlexey Vakhov2012-04-031-2/+2
|/ / / / /
* | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-04-011-1/+0
|\ \ \ \ \
| * | | | | CSRF messages are no longer controlled by 422.html because InvalidAuthenticit...Tony Primerano2012-03-281-1/+0
| |/ / / /
* | | | | Remove obsolete reader from AC::MethodNotAllowed exception classAlexey Vakhov2012-03-311-2/+0
* | | | | Remove AC::RenderError class second declarationAlexey Vakhov2012-03-311-3/+0
|/ / / /
* | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-03-272-2/+2
|\ \ \ \
| * | | | Proc objects for caches_page no need controller objectAlexey Vakhov2012-03-271-1/+1
| * | | | Fix AC actions caching commentAlexey Vakhov2012-03-241-1/+1
* | | | | Don't ignore non Enumerable values passed to sanitize (closes #5585)Piotr Sarnacki2012-03-271-0/+11
* | | | | ActionController caching small String#split optimizationAlexey Vakhov2012-03-241-2/+2
|/ / / /
* | | | We dont need to merge in the parameters as thats all being reset by the rack ...David Heinemeier Hansson2012-03-201-1/+0
* | | | respond_with description: changed 'response' to 'format'Mark Thomson2012-03-181-1/+1
* | | | Revised comments for respond_withMark Thomson2012-03-181-17/+18
* | | | Merge remote-tracking branch 'origin/master'Mark Thomson2012-03-1712-56/+86
|\ \ \ \
| * | | | fixed - warning: instance variable @controller not initializedSandeep2012-03-161-0/+5
| * | | | strip null bytes from Location header as wellBrian Lopez2012-03-151-1/+1
| * | | | Simplify helpers handling. Ensure Metal can run AC hooks.José Valim2012-03-154-35/+34
| * | | | Remove ActionController::TestCase#rescue_action_in_public!Piotr Sarnacki2012-03-151-5/+0
| * | | | Remove --http.José Valim2012-03-141-134/+0
| * | | | Merge pull request #5357 from bagilevi/sweeper-undefined-method-ignoredPiotr Sarnacki2012-03-141-1/+1
| |\ \ \ \
| | * | | | Don't ignore call to undefined method in SweeperLevente Bagi2012-03-061-1/+1
| * | | | | Add ActionController::HTTPSantiago Pastorino2012-03-145-6/+146
| * | | | | Remove Active Resource source files from the repositoryPrem Sichanugrist2012-03-131-2/+2
| * | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-03-131-1/+24
| |\ \ \ \ \
| * | | | | | 'module' is reserved word. Sample of code with error - not cool.Egor Homakov2012-03-131-2/+2
| * | | | | | Updated description of #retrieve_collector_from_mimesMark Thomson2012-03-131-2/+6
| * | | | | | Merge pull request #5375 from nertzy/assert_template_with_regexpAaron Patterson2012-03-121-2/+7
| |\ \ \ \ \ \
| | * | | | | | assert_template matches against RegexpGrant Hutchins2012-03-101-2/+7
| * | | | | | | Merge pull request #5326 from lest/patch-2Michael Koziarski2012-03-101-2/+18
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | configure how unverified request will be handledSergey Nartimov2012-03-091-2/+18