aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #5375 from nertzy/assert_template_with_regexpAaron Patterson2012-03-122-2/+13
|\
| * assert_template matches against RegexpGrant Hutchins2012-03-102-2/+13
* | Merge pull request #5380 from benmmurphy/escape_unicode_paragraph_separatorAaron Patterson2012-03-122-1/+5
|\ \
| * | ensure u2029 is escaped in escape_javascript helperbenmmurphy2012-03-112-1/+5
* | | Merge pull request #5366 from parndt/fix_issue_5324José Valim2012-03-117-186/+185
|\ \ \ | |/ / |/| |
| * | Documented the removal of size from text_field based helpers and cols, rows f...Philip Arndt2012-03-121-0/+4
| * | 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-106-187/+182
* | | Merge pull request #5326 from lest/patch-2Michael Koziarski2012-03-102-4/+20
|\ \ \ | |_|/ |/| |
| * | configure how unverified request will be handledSergey Nartimov2012-03-092-4/+20
* | | @controller already includes url_helpers in with_routing methodSantiago Pastorino2012-03-101-1/+0
* | | Add missing requireSantiago Pastorino2012-03-101-0/+1
* | | AbstractController.action_methods should return a SetSantiago Pastorino2012-03-102-3/+4
| |/ |/|
* | Minor changelog fixes [ci skip]Vijay Dev2012-03-091-1/+1
* | Fix my name in the CHANGELOG to follow the conventionRafael Mendonça França2012-03-091-10/+16
* | fix incorrect changelog headings [ci skip].Vijay Dev2012-03-091-12/+13
* | changelog updates for Rails 4 [ci skip]Vijay Dev2012-03-091-0/+12
* | 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
* | Add test case for #5307Carlos Antonio da Silva2012-03-071-2/+6
* | Merge pull request #5310 from Serabe/layout_for_partials_with_collectionsJosé Valim2012-03-064-1/+53
|\ \
| * | Adds line to change log and update documentation.Sergio Arbeo2012-03-072-0/+39
| * | Adds :layout option to render :partial when a collection is given.Sergio Arbeo2012-03-063-1/+14
* | | Refactor AD::UploadedFile, and raise sooner if tempfile is not presentCarlos Antonio da Silva2012-03-062-9/+7
* | | 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
* | | Use latest rack-cache.José Valim2012-03-061-1/+1
* | | Merge pull request #5298 from sikachu/master-fix-responderJosé Valim2012-03-063-12/+49
|\ \ \
| * | | Always passing a respond block from to responderPrem Sichanugrist2012-03-052-12/+13
| * | | Failing test for mime responder respond_with using a block.Mario Visic2012-03-051-0/+36
| |/ /
* / / Compute asset paths from the request if ENV["RAILS_RELATIVE_URL_ROOT"] is not...Dwayne Litzenberger2012-03-053-1/+104
|/ /
* | Merge pull request #5290 from steveklabnik/masterJosé Valim2012-03-052-3/+9
|\ \
| * | Added parsing of arbitrary media type parameters.Steve Klabnik2012-03-052-3/+9
* | | force response body to be read in assert_templateSergey Nartimov2012-03-052-0/+17
* | | document the shortcut to the root route helper [ci skip]Vijay Dev2012-03-051-0/+2
|/ /
* | Merge pull request #5269 from castlerock/remove_unwanted_require_karnel_repor...Piotr Sarnacki2012-03-041-1/+0
|\ \
| * | AS/kernel/reporting no where used in ts_isolatedVishnu Atrai2012-03-041-1/+0
* | | Route root helper shortcutBrian Cardarella2012-03-032-0/+14
|/ /
* | 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