aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
Commit message (Expand)AuthorAgeFilesLines
* '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 #5380 from benmmurphy/escape_unicode_paragraph_separatorAaron Patterson2012-03-121-1/+3
|\ \
| * | ensure u2029 is escaped in escape_javascript helperbenmmurphy2012-03-111-1/+3
* | | Merge pull request #5366 from parndt/fix_issue_5324José Valim2012-03-114-21/+16
|\ \ \ | |/ / |/| |
| * | Fix unintended removal of 'cols' from a text_area example.Philip Arndt2012-03-121-1/+1
| * | Fixes #5324 by removing default size options from input:text and default cols...Philip Arndt2012-03-104-22/+17
* | | 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
* | | AbstractController.action_methods should return a SetSantiago Pastorino2012-03-101-2/+3
| |/ |/|
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-03-091-0/+10
|\ \ | |/ |/|
| * copy edits [ci skip]Vijay Dev2012-03-071-2/+2
| * Add some docs for ActionController::Base.without_modulesCarlos Antonio da Silva2012-03-061-0/+10
* | Set the rendered_format on respond_to.José Valim2012-03-071-0/+1
* | Just change the formats on first render, closes #5307, closes #5308.José Valim2012-03-071-2/+7
* | Merge pull request #5310 from Serabe/layout_for_partials_with_collectionsJosé Valim2012-03-061-1/+46
|\ \
| * | Adds line to change log and update documentation.Sergio Arbeo2012-03-071-0/+37
| * | Adds :layout option to render :partial when a collection is given.Sergio Arbeo2012-03-061-1/+9
* | | Refactor AD::UploadedFile, and raise sooner if tempfile is not presentCarlos Antonio da Silva2012-03-061-8/+6
* | | Remove unused ActionController::SessionManagementSantiago Pastorino2012-03-063-11/+0
* | | Avoid ImplicitRender just call render directlySantiago Pastorino2012-03-061-3/+1
* | | Clean up module docs [ci skip]Vijay Dev2012-03-072-27/+27
* | | Merge pull request #5298 from sikachu/master-fix-responderJosé Valim2012-03-062-12/+13
|\ \ \
| * | | Always passing a respond block from to responderPrem Sichanugrist2012-03-052-12/+13
| |/ /
* / / Compute asset paths from the request if ENV["RAILS_RELATIVE_URL_ROOT"] is not...Dwayne Litzenberger2012-03-051-1/+1
|/ /
* | Merge pull request #5290 from steveklabnik/masterJosé Valim2012-03-051-3/+3
|\ \
| * | Added parsing of arbitrary media type parameters.Steve Klabnik2012-03-051-3/+3
* | | force response body to be read in assert_templateSergey Nartimov2012-03-051-0/+4
|/ /
* | Route root helper shortcutBrian Cardarella2012-03-031-0/+5
* | Merge pull request #5246 from lest/patch-2José Valim2012-03-031-1/+1
|\ \
| * | simplify namespace assignment in fields_forSergey Nartimov2012-03-021-1/+1
* | | remove usages of AS::OrderedHashVishnu Atrai2012-03-031-1/+1
| |/ |/|
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-03-031-1/+1
|\ \
| * | Removed max-stale from the setting the cache-headers in the response as max-s...Anuj Dutta2012-03-021-1/+1
* | | Turn off verbose mode of rack-cache, we still have X-Rack-Cache to check that...Santiago Pastorino2012-03-031-1/+1
| |/ |/|
* | Can't cache url_options on a controller levelPiotr Sarnacki2012-03-021-11/+12
* | don't pass unnecessary argumentSergey Nartimov2012-03-021-2/+2
* | Merge pull request #5242 from rails/opt_routesJosé Valim2012-03-026-39/+98
|\ \
| * | Optimize url helpers.Sergey Nartimov + José Valim2012-03-023-20/+27
| * | Optimize path helpers.José Valim2012-03-025-29/+81
* | | Fix #5238, rendered_format is not set when template is not renderedPiotr Sarnacki2012-03-021-0/+2
* | | Allow fieldsets to be created without a block.Ben Pickles2012-03-011-2/+1
|/ /
* | Merge branch 'master-security'Aaron Patterson2012-03-012-4/+3
|\ \
| * | use AS::SafeBuffer#clone_empty for flushing the output_bufferAkira Matsuda2012-02-201-1/+1
| * | fix output safety issue with select optionsSergey Nartimov2012-02-201-3/+3
* | | Tap, tap goes the middlewareJeremy Kemper2012-02-291-4/+1
* | | Merge pull request #5203 from avakhov/anonymous-controller-layoutAaron Patterson2012-02-291-0/+4
|\ \ \
| * | | Fix layout lookup for anonymous controllerAlexey Vakhov2012-02-281-0/+4
| | |/ | |/|