Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Updated description of #retrieve_collector_from_mimes | Mark Thomson | 2012-03-13 | 1 | -2/+6 |
| | |||||
* | Remove unused method | Santiago Pastorino | 2012-03-12 | 1 | -4/+0 |
| | |||||
* | Merge pull request #5375 from nertzy/assert_template_with_regexp | Aaron Patterson | 2012-03-12 | 2 | -2/+13 |
|\ | | | | | assert_template matches against Regexp | ||||
| * | assert_template matches against Regexp | Grant Hutchins | 2012-03-10 | 2 | -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_separator | Aaron Patterson | 2012-03-12 | 2 | -1/+5 |
|\ \ | | | | | | | ensure u2029 is escaped in escape_javascript helper | ||||
| * | | ensure u2029 is escaped in escape_javascript helper | benmmurphy | 2012-03-11 | 2 | -1/+5 |
| | | | |||||
* | | | Merge pull request #5366 from parndt/fix_issue_5324 | José Valim | 2012-03-11 | 7 | -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 Arndt | 2012-03-12 | 1 | -0/+4 |
| | | | | | | | | | | | | from text_area helper. | ||||
| * | | Fix unintended removal of 'cols' from a text_area example. | Philip Arndt | 2012-03-12 | 1 | -1/+1 |
| | | | |||||
| * | | Fixes #5324 by removing default size options from input:text and default ↵ | Philip Arndt | 2012-03-10 | 6 | -187/+182 |
| | | | | | | | | | | | | cols and rows options from textarea. | ||||
* | | | Merge pull request #5326 from lest/patch-2 | Michael Koziarski | 2012-03-10 | 2 | -4/+20 |
|\ \ \ | |_|/ |/| | | configure how unverified request will be handled | ||||
| * | | configure how unverified request will be handled | Sergey Nartimov | 2012-03-09 | 2 | -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 method | Santiago Pastorino | 2012-03-10 | 1 | -1/+0 |
| | | | |||||
* | | | Add missing require | Santiago Pastorino | 2012-03-10 | 1 | -0/+1 |
| | | | |||||
* | | | AbstractController.action_methods should return a Set | Santiago Pastorino | 2012-03-10 | 2 | -3/+4 |
| |/ |/| | |||||
* | | Minor changelog fixes [ci skip] | Vijay Dev | 2012-03-09 | 1 | -1/+1 |
| | | |||||
* | | Fix my name in the CHANGELOG to follow the convention | Rafael Mendonça França | 2012-03-09 | 1 | -10/+16 |
| | | | | | | | | Also add missing entries and use the formating convention | ||||
* | | fix incorrect changelog headings [ci skip]. | Vijay Dev | 2012-03-09 | 1 | -12/+13 |
| | | | | | | | | Last commit message should not have said 'Rails 4' either | ||||
* | | changelog updates for Rails 4 [ci skip] | Vijay Dev | 2012-03-09 | 1 | -0/+12 |
| | | |||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-03-09 | 1 | -0/+10 |
|\ \ | |/ |/| | |||||
| * | copy edits [ci skip] | Vijay Dev | 2012-03-07 | 1 | -2/+2 |
| | | |||||
| * | Add some docs for ActionController::Base.without_modules | Carlos Antonio da Silva | 2012-03-06 | 1 | -0/+10 |
| | | |||||
* | | Set the rendered_format on respond_to. | José Valim | 2012-03-07 | 1 | -0/+1 |
| | | |||||
* | | Just change the formats on first render, closes #5307, closes #5308. | José Valim | 2012-03-07 | 1 | -2/+7 |
| | | |||||
* | | Add test case for #5307 | Carlos Antonio da Silva | 2012-03-07 | 1 | -2/+6 |
| | | |||||
* | | Merge pull request #5310 from Serabe/layout_for_partials_with_collections | José Valim | 2012-03-06 | 4 | -1/+53 |
|\ \ | | | | | | | Adds :layout option to render :partial when a collection is given. | ||||
| * | | Adds line to change log and update documentation. | Sergio Arbeo | 2012-03-07 | 2 | -0/+39 |
| | | | |||||
| * | | Adds :layout option to render :partial when a collection is given. | Sergio Arbeo | 2012-03-06 | 3 | -1/+14 |
| | | | |||||
* | | | Refactor AD::UploadedFile, and raise sooner if tempfile is not present | Carlos Antonio da Silva | 2012-03-06 | 2 | -9/+7 |
| | | | |||||
* | | | Remove unused ActionController::SessionManagement | Santiago Pastorino | 2012-03-06 | 3 | -11/+0 |
| | | | |||||
* | | | Avoid ImplicitRender just call render directly | Santiago Pastorino | 2012-03-06 | 1 | -3/+1 |
| | | | |||||
* | | | Clean up module docs [ci skip] | Vijay Dev | 2012-03-07 | 2 | -27/+27 |
| | | | | | | | | | | | | Removed some useless docstrings and no-doc'ed some. | ||||
* | | | Use latest rack-cache. | José Valim | 2012-03-06 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #5298 from sikachu/master-fix-responder | José Valim | 2012-03-06 | 3 | -12/+49 |
|\ \ \ | | | | | | | | | Always passing a respond block from to responder | ||||
| * | | | Always passing a respond block from to responder | Prem Sichanugrist | 2012-03-05 | 2 | -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 Visic | 2012-03-05 | 1 | -0/+36 |
| |/ / | |||||
* / / | Compute asset paths from the request if ENV["RAILS_RELATIVE_URL_ROOT"] is ↵ | Dwayne Litzenberger | 2012-03-05 | 3 | -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/master | José Valim | 2012-03-05 | 2 | -3/+9 |
|\ \ | | | | | | | Added parsing of arbitrary media type parameters. | ||||
| * | | Added parsing of arbitrary media type parameters. | Steve Klabnik | 2012-03-05 | 2 | -3/+9 |
| | | | | | | | | | | | | | | | | | | Based on #4918. Related to #4127. | ||||
* | | | force response body to be read in assert_template | Sergey Nartimov | 2012-03-05 | 2 | -0/+17 |
| | | | |||||
* | | | document the shortcut to the root route helper [ci skip] | Vijay Dev | 2012-03-05 | 1 | -0/+2 |
|/ / | | | | | | | This was implemented in 2ee4dd856d47113625589bc5410b5a6669ea02d5 | ||||
* | | Merge pull request #5269 from ↵ | Piotr Sarnacki | 2012-03-04 | 1 | -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_isolated | Vishnu Atrai | 2012-03-04 | 1 | -1/+0 |
| | | | |||||
* | | | Route root helper shortcut | Brian Cardarella | 2012-03-03 | 2 | -0/+14 |
|/ / | | | | | | | Allow the root route helper to accept just a string | ||||
* | | Merge pull request #5246 from lest/patch-2 | José Valim | 2012-03-03 | 1 | -1/+1 |
|\ \ | | | | | | | simplify namespace assignment in fields_for | ||||
| * | | simplify namespace assignment in fields_for | Sergey Nartimov | 2012-03-02 | 1 | -1/+1 |
| | | | |||||
* | | | remove usages of AS::OrderedHash | Vishnu Atrai | 2012-03-03 | 1 | -1/+1 |
| |/ |/| | |||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-03-03 | 1 | -1/+1 |
|\ \ | |||||
| * | | Removed max-stale from the setting the cache-headers in the response as ↵ | Anuj Dutta | 2012-03-02 | 1 | -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 Pastorino | 2012-03-03 | 1 | -1/+1 |
| |/ |/| | | | | | | | | | that info Closes #5245 |