aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* Updated description of #retrieve_collector_from_mimesMark Thomson2012-03-131-2/+6
|
* Remove unused methodSantiago Pastorino2012-03-121-4/+0
|
* Merge pull request #5375 from nertzy/assert_template_with_regexpAaron Patterson2012-03-122-2/+13
|\ | | | | assert_template matches against Regexp
| * assert_template matches against RegexpGrant Hutchins2012-03-102-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows for more strict template assertions, while maintaining backward compatibility. For example, if you use assert_template("foo/bar") and "foo/bar/baz" was rendered, the test passes. But if you use assert_template(%r{\Afoo/bar\Z}), you will catch that a different template was rendered. Also, if you passed an unsupported argument to assert_template() in the past, it would silently succeed. Now it raises an ArgumentError.
* | Merge pull request #5380 from benmmurphy/escape_unicode_paragraph_separatorAaron Patterson2012-03-122-1/+5
|\ \ | | | | | | ensure u2029 is escaped in escape_javascript helper
| * | 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
|\ \ \ | |/ / |/| | Fixes #5324 by removing default size options from input:text and default cols and rows options from textarea.
| * | Documented the removal of size from text_field based helpers and cols, rows ↵Philip Arndt2012-03-121-0/+4
| | | | | | | | | | | | from text_area helper.
| * | 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 ↵Philip Arndt2012-03-106-187/+182
| | | | | | | | | | | | cols and rows options from textarea.
* | | Merge pull request #5326 from lest/patch-2Michael Koziarski2012-03-102-4/+20
|\ \ \ | |_|/ |/| | configure how unverified request will be handled
| * | configure how unverified request will be handledSergey Nartimov2012-03-092-4/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | can be configured using `:with` option in `protect_from_forgery` method or `request_forgery_protection_method` config option possible values: - :reset_session (default) - :exception new applications are generated with: protect_from_forgery :with => :exception
* | | @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
| | | | | | | | Also add missing entries and use the formating convention
* | fix incorrect changelog headings [ci skip].Vijay Dev2012-03-091-12/+13
| | | | | | | | Last commit message should not have said 'Rails 4' either
* | 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 :layout option to render :partial when a collection is given.
| * | 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
| | | | | | | | | | | | Removed some useless docstrings and no-doc'ed some.
* | | 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 responder
| * | | Always passing a respond block from to responderPrem Sichanugrist2012-03-052-12/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We should let the responder to decide what to do with the given overridden response block, and not short circuit it. Fixes #5280
| * | | 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 ↵Dwayne Litzenberger2012-03-053-1/+104
|/ / | | | | | | | | | | | | | | | | not set. This should fix the following issue: "Rails is not a Rack Application (SCRIPT_NAME vs. relative_url_root ?)" https://github.com/rails/rails/issues/910
* | Merge pull request #5290 from steveklabnik/masterJosé Valim2012-03-052-3/+9
|\ \ | | | | | | Added parsing of arbitrary media type parameters.
| * | Added parsing of arbitrary media type parameters.Steve Klabnik2012-03-052-3/+9
| | | | | | | | | | | | | | | | | | Based on #4918. Related to #4127.
* | | 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
|/ / | | | | | | This was implemented in 2ee4dd856d47113625589bc5410b5a6669ea02d5
* | Merge pull request #5269 from ↵Piotr Sarnacki2012-03-041-1/+0
|\ \ | | | | | | | | | | | | castlerock/remove_unwanted_require_karnel_reporting AS/kernel/reporting no where used in ts_isolated
| * | AS/kernel/reporting no where used in ts_isolatedVishnu Atrai2012-03-041-1/+0
| | |
* | | Route root helper shortcutBrian Cardarella2012-03-032-0/+14
|/ / | | | | | | Allow the root route helper to accept just a string
* | Merge pull request #5246 from lest/patch-2José Valim2012-03-031-1/+1
|\ \ | | | | | | simplify namespace assignment in fields_for
| * | 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 ↵Anuj Dutta2012-03-021-1/+1
| | | | | | | | | | | | max-stale is a cache request header.
* | | Turn off verbose mode of rack-cache, we still have X-Rack-Cache to check ↵Santiago Pastorino2012-03-031-1/+1
| |/ |/| | | | | | | | | that info Closes #5245