Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | update version to 4.2.0.alpha | Yves Senn | 2014-02-23 | 1 | -1/+1 | |
| | | ||||||
* | | Check if the `request` variable isn't nil when calling render_to_string | Joan Karadimov | 2014-02-20 | 1 | -1/+3 | |
|/ | | | | closes #14125 | |||||
* | Update Docs in favor to use render plain instead of text option | robertomiranda | 2014-02-18 | 3 | -8/+8 | |
| | | | | ref #14062 | |||||
* | Merge branch '4-1-0-beta2' | Rafael Mendonça França | 2014-02-18 | 1 | -1/+1 | |
|\ | | | | | | | | | | | Conflicts: actionview/CHANGELOG.md activerecord/CHANGELOG.md | |||||
| * | Preparing for 4.1.0.beta2 release | Rafael Mendonça França | 2014-02-18 | 1 | -1/+1 | |
| | | ||||||
* | | Add `#no_content_type` attribute to `AD::Response` | Prem Sichanugrist | 2014-02-18 | 4 | -11/+20 | |
| | | | | | | | | | | Setting this attribute to `true` will remove the content type header from the request. This is use in `render :body` feature. | |||||
* | | Cleanup `ActionController::Rendering` | Prem Sichanugrist | 2014-02-18 | 1 | -11/+27 | |
| | | ||||||
* | | Introduce `render :html` for render HTML string | Prem Sichanugrist | 2014-02-18 | 3 | -2/+201 | |
| | | | | | | | | | | | | | | | | | | This is an option for to HTML content with a content type of `text/html`. This rendering option calls `ERB::Util.html_escape` internally to escape unsafe HTML string, so you will have to mark your string as html safe if you have any HTML tag in it. Please see #12374 for more detail. | |||||
* | | Introduce `render :plain` for render plain text | Prem Sichanugrist | 2014-02-18 | 3 | -2/+186 | |
| | | | | | | | | | | | | | | | | This is as an option to render content with a content type of `text/plain`. This is the preferred option if you are planning to render a plain text content. Please see #12374 for more detail. | |||||
* | | Update hash format for render_text_test | Prem Sichanugrist | 2014-02-18 | 1 | -18/+18 | |
| | | ||||||
* | | Introduce `render :body` for render raw content | Prem Sichanugrist | 2014-02-18 | 6 | -7/+211 | |
| | | | | | | | | | | | | | | | | | | | | | | | | This is an option for sending a raw content back to browser. Note that this rendering option will unset the default content type and does not include "Content-Type" header back in the response. You should only use this option if you are expecting the "Content-Type" header to not be set. More information on "Content-Type" header can be found on RFC 2616, section 7.2.1. Please see #12374 for more detail. | |||||
* | | Fix parameter naming in RemoteIp middleware constructor method | KalabiYau | 2014-02-18 | 1 | -2/+2 | |
| | | | | | | | | | | Was custom_proxies in inline docs, but should be and defined in constructor as custom_proxies | |||||
* | | Correct prestreaming controller response status. | Kevin Casey | 2014-02-15 | 3 | -0/+27 | |
| | | | | | | | | | | | | if the controller action has not yet streamed any data, actions should process as normal, and errors should trigger the appropriate behavior (500, or in the case of ActionController::BadRequest, a 400 Bad Request) | |||||
* | | No variant should also be picked up by variant.any if variant.none is not ↵ | David Heinemeier Hansson | 2014-02-13 | 2 | -1/+5 | |
| | | | | | | | | defined (just like any other variant) | |||||
* | | Check if variant array contains only symbols | Łukasz Strzałkowski | 2014-02-13 | 2 | -2/+10 | |
| | | ||||||
* | | Variant negotiation | Lukasz Strzalkowski | 2014-02-13 | 4 | -11/+50 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow setting `request.variant` as an array - an order in which they will be rendered. For example: request.variant = [:tablet, :phone] respond_to do |format| format.html.none format.html.phone # this gets rendered end | |||||
* | | rm warning about variable shadowing | Godfrey Chan | 2014-02-11 | 1 | -2/+2 | |
| | | ||||||
* | | Migrate hash-based cookie values correctly | Godfrey Chan | 2014-02-11 | 1 | -2/+4 | |
| | | ||||||
* | | Updated CHANGELOG, docs, guides and release notes. | Godfrey Chan | 2014-02-11 | 1 | -15/+14 | |
| | | | | | | | | Also added a `cookies_serializer.rb` initializer to the app template. | |||||
* | | Added changelog entry for Flash changes [ci skip] | Godfrey Chan | 2014-02-11 | 1 | -0/+4 | |
| | | ||||||
* | | Missed FlashHash#replace | Godfrey Chan | 2014-02-11 | 1 | -1/+1 | |
| | | ||||||
* | | Fixed broken flash tests | Godfrey Chan | 2014-02-11 | 2 | -5/+5 | |
| | | ||||||
* | | Re-write legacy (marshal) cookies on read | Godfrey Chan | 2014-02-11 | 2 | -35/+57 | |
| | | ||||||
* | | Stringify the incoming hash in FlashHash | Guillermo Iguaran | 2014-02-11 | 1 | -1/+3 | |
| | | | | | | | | | | Stringify the incoming as well to handle incoming symbol keys from marshalled sessions | |||||
* | | Convert FlashHash in a Hash with indifferent access | Guillermo Iguaran | 2014-02-11 | 2 | -4/+25 | |
| | | ||||||
* | | Changed the tests to ensure HybridSerializer actually migrates the cookies ↵ | Godfrey Chan | 2014-02-11 | 1 | -10/+18 | |
| | | | | | | | | (currently failing) | |||||
* | | Fixed minor typo in test code | Godfrey Chan | 2014-02-11 | 1 | -1/+1 | |
| | | ||||||
* | | Tests for the HybridSerializer | Rafael Mendonça França | 2014-02-11 | 1 | -0/+68 | |
| | | ||||||
* | | Removed an old test | Godfrey Chan | 2014-02-11 | 1 | -5/+0 | |
| | | ||||||
* | | Added HybridSerializer to upgrade existing marshal cookies (wip: need tests) | Godfrey Chan | 2014-02-11 | 1 | -0/+14 | |
| | | ||||||
* | | Just very so slightly better test coverage | Godfrey Chan | 2014-02-11 | 1 | -15/+57 | |
| | | ||||||
* | | Renamed session_serializer option to cookies_serializer | Godfrey Chan | 2014-02-11 | 5 | -50/+36 | |
| | | ||||||
* | | docs, link to HTTP and CGI header definitions. [ci skip] | Yves Senn | 2014-02-10 | 1 | -1/+1 | |
| | | | | | | | | This was a reaction to: https://github.com/rails/rails/pull/9700#issuecomment-34550210 | |||||
* | | Set the :shallow_path as each scope is generated | Andrew White | 2014-02-09 | 3 | -1/+95 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we set :shallow_path when shallow is called it can result in incorrect paths if the resource is inside a namespace because namespace itself sets the :shallow_path option to the namespace path. We fix this by removing the :shallow_path option from shallow as that should only be turning shallow routes on and not otherwise affecting the scope. To do this we need to treat the :shallow option to resources differently to other scope options and move it to before the nested block is called. This change also has the positive side effect of making the behavior of the :shallow option consistent with the shallow method. Fixes #12498. | |||||
* | | Merge branch 'master' of github.com:rails/docrails | Vijay Dev | 2014-02-09 | 1 | -3/+3 | |
|\ \ | | | | | | | | | | | | | | | | | | | Conflicts: guides/source/active_record_validations.md guides/source/api_documentation_guidelines.md guides/source/configuring.md | |||||
| * | | add punctuation | Waynn Lue | 2014-01-13 | 1 | -2/+2 | |
| | | | ||||||
| * | | change to "check out" | Waynn Lue | 2014-01-08 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge pull request #13982 from dskang/fix-response-flatten-infinite-recursion | Aaron Patterson | 2014-02-09 | 2 | -1/+19 | |
|\ \ \ | | | | | | | | | Fix response flatten infinite recursion | |||||
| * | | | Prevent [response].flatten from recursing infinitely. | Dan Kang | 2014-02-08 | 2 | -1/+10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Returning `self` from within the array returned by `to_ary` caused this. Instead, we can just substitute another object. It provides the `each` behavior required by the rack spec. | |||||
| * | | | Add missing test for response destructuring. | Myron Marston | 2014-02-08 | 1 | -0/+9 | |
| | | | | ||||||
* | | | | Merge pull request #13990 from zzak/ap_dont_autoload_filter_parameters | Rafael Mendonça França | 2014-02-09 | 1 | -1/+0 | |
|\ \ \ \ | | | | | | | | | | | FilterParameters is referenced at the class level from the Request | |||||
| * | | | | FilterParameters is referenced at the class level from the Request | Zachary Scott | 2014-02-09 | 1 | -1/+0 | |
| |/ / / | | | | | | | | | | | | | | | | | Since it's already required in the file, we don't need to use autoload too. This commit is symmetrical change to 0b10180 for Response. | |||||
* | | | | Merge pull request #13985 from zzak/remove_old_todo_in_url_for_test | Carlos Antonio da Silva | 2014-02-09 | 1 | -3/+0 | |
|\ \ \ \ | | | | | | | | | | | Remove outdated TODO from url_for test, this test was fixed in 900a2d30 | |||||
| * | | | | Remove outdated TODO from url_for test, this test was fixed in 900a2d30 | Zachary Scott | 2014-02-09 | 1 | -3/+0 | |
| |/ / / | ||||||
* | | | | use File.exist? instead of File.exists? | SHIBATA Hiroshi | 2014-02-09 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Skips tests on Windows that create files with illegal characters | Mikko Johansson | 2014-02-09 | 1 | -2/+7 | |
|/ / / | ||||||
* | | | Updated the cookie docs to use the safer JSON.{generate,parse} | Godfrey Chan | 2014-02-08 | 1 | -5/+5 | |
| | | | | | | | | | | | | cc @senny | |||||
* | | | Rely on backticks instead of tt tags [ci skip] | Robin Dupret | 2014-02-08 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | Since the language in code blocks is inferred, if the code contains tt tags, the block will be parsed as XML for instance while it is Ruby. | |||||
* | | | docs, Cookie values are String based. Closes #12860. [ci skip] | Yves Senn | 2014-02-08 | 1 | -7/+7 | |
| | | | ||||||
* | | | Require action_view to fix missing constant | Philipe Fatio | 2014-02-07 | 2 | -0/+6 | |
| | | | | | | | | | | | | | | | Previously, requiring action_view/view_paths did cause an uninitialized constant error for ENCODING_FLAG, which is defined in action_view. |