| Commit message (Expand) | Author | Age | Files | Lines |
* | update comments to reflect that options support is not available | Frederick Cheung | 2014-03-25 | 1 | -2/+2 |
* | Swapped parameters of assert_equal in assert_select | Vishal Lal | 2014-03-22 | 1 | -1/+1 |
* | The digest option is no longer honoured since Rails 3.0 [ci skip] | Godfrey Chan | 2014-03-20 | 1 | -1/+1 |
* | Merge pull request #14090 from Fortisque/kevin/stream_error_in_main_thread_if... | Aaron Patterson | 2014-03-17 | 1 | -10/+11 |
|\ |
|
| * | re-raise error if error occurs before committing in streaming | Kevin Casey | 2014-03-14 | 1 | -10/+11 |
* | | Use nested_scope? not shallow? to determine whether to copy options | Andrew White | 2014-03-16 | 1 | -1/+5 |
|/ |
|
* | use the body proxy to freeze headers | Aaron Patterson | 2014-03-12 | 3 | -8/+41 |
* | just ask the response for the commit status, we do not need to ask the jar | Aaron Patterson | 2014-03-12 | 1 | -1/+1 |
* | only write the jar if the response isn't committed | Aaron Patterson | 2014-03-12 | 4 | -10/+43 |
* | Merge pull request #14291 from laurocaetano/doc-for-original-fullpath | Yves Senn | 2014-03-12 | 1 | -0/+7 |
|\ |
|
| * | [ci skip] Add documentation for original_fullpath. | Lauro Caetano | 2014-03-11 | 1 | -0/+7 |
* | | Merge pull request #14262 from sferik/flat_map | Andrew White | 2014-03-09 | 7 | -18/+18 |
|\ \ |
|
| * | | Replace map.flatten with flat_map in actionpack | Erik Michaels-Ober | 2014-03-03 | 7 | -18/+18 |
* | | | Copy shallow options from normal options when using scope | Andrew White | 2014-03-08 | 1 | -1/+2 |
* | | | Pull namespace defaults out of the options hash | Andrew White | 2014-03-08 | 1 | -3/+10 |
* | | | Only use shallow nested scope when depth is > 1 | Andrew White | 2014-03-08 | 1 | -20/+23 |
* | | | Move setting :scope_level_resource to resource_scope | Andrew White | 2014-03-08 | 1 | -7/+7 |
* | | | Merge pull request #14280 from joho/make_csrf_failure_logging_optional | Santiago Pastorino | 2014-03-08 | 1 | -1/+7 |
|\ \ \ |
|
| * | | | Make CSRF failure logging optional/configurable. | John Barton (joho) | 2014-03-05 | 1 | -1/+7 |
| |/ / |
|
* | | | Merge branch 'master' of github.com:rails/docrails | Vijay Dev | 2014-03-07 | 1 | -1/+1 |
|\ \ \ |
|
| * | | | :scissors: | Zachary Scott | 2014-02-23 | 1 | -1/+1 |
* | | | | Merge pull request #14285 from sikachu/master-revert-render-body-remove-conte... | Aaron Patterson | 2014-03-06 | 3 | -17/+4 |
|\ \ \ \
| |_|_|/
|/| | | |
|
| * | | | Do note remove `Content-Type` when `render :body` | Prem Sichanugrist | 2014-03-05 | 3 | -17/+4 |
| | |/
| |/| |
|
* / | | Introduce `Rails.gem_version` | Prem Sichanugrist | 2014-03-05 | 2 | -7/+19 |
|/ / |
|
* | | Add spaces to deep_munge log message. | Shuhei Kagawa | 2014-03-03 | 1 | -3/+3 |
* | | Replace map.flatten(1) with flat_map | Erik Michaels-Ober | 2014-02-28 | 2 | -5/+5 |
* | | use built-in exception handling in live controllers | Aaron Patterson | 2014-02-28 | 1 | -2/+5 |
* | | live controllers should have live responses | Aaron Patterson | 2014-02-28 | 2 | -8/+36 |
* | | set the error callback to a nice default in case nobody set an error callback... | Aaron Patterson | 2014-02-28 | 1 | -1/+1 |
* | | Fix controller test not resetting @_url_options | Tony Wooster | 2014-02-26 | 2 | -1/+1 |
* | | `ActionDispatch::Head` was replaced by `Rack::Head`. Closes #14191. | Yves Senn | 2014-02-25 | 1 | -1/+0 |
* | | Simple Sungularize ActionController::UnpermittedParameters error in case when... | Serj L | 2014-02-24 | 2 | -2/+2 |
* | | 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 |
|/ |
|
* | Update Docs in favor to use render plain instead of text option | robertomiranda | 2014-02-18 | 3 | -8/+8 |
* | Merge branch '4-1-0-beta2' | Rafael Mendonça França | 2014-02-18 | 1 | -1/+1 |
|\ |
|
| * | 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 | 3 | -10/+19 |
* | | Cleanup `ActionController::Rendering` | Prem Sichanugrist | 2014-02-18 | 1 | -11/+27 |
* | | Introduce `render :html` for render HTML string | Prem Sichanugrist | 2014-02-18 | 1 | -2/+2 |
* | | Introduce `render :plain` for render plain text | Prem Sichanugrist | 2014-02-18 | 1 | -2/+10 |
* | | Introduce `render :body` for render raw content | Prem Sichanugrist | 2014-02-18 | 3 | -7/+16 |
* | | Fix parameter naming in RemoteIp middleware constructor method | KalabiYau | 2014-02-18 | 1 | -2/+2 |
* | | Correct prestreaming controller response status. | Kevin Casey | 2014-02-15 | 1 | -0/+2 |
* | | No variant should also be picked up by variant.any if variant.none is not def... | David Heinemeier Hansson | 2014-02-13 | 1 | -1/+1 |
* | | Check if variant array contains only symbols | Łukasz Strzałkowski | 2014-02-13 | 1 | -2/+2 |
* | | Variant negotiation | Lukasz Strzalkowski | 2014-02-13 | 2 | -10/+24 |
* | | 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 |
* | | Missed FlashHash#replace | Godfrey Chan | 2014-02-11 | 1 | -1/+1 |