aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fixed typo in mysql client parameterKent Sibilev2015-12-091-1/+1
|
* Merge pull request #20831 from jmbejar/rails-api-json-error-responseSantiago Pastorino2015-12-0912-69/+279
|\ | | | | Rails API: Ability to return error responses in json format also in development
| * Avoid calling AD::MimeNegotiation#format_from_path_extension method twiceJorge Bejar2015-12-091-2/+2
| |
| * Remove duplicated assertion from api_app_generator testsJorge Bejar2015-12-091-2/+0
| |
| * We don't need to set config.debug_exception_response_format given that :api ↵Jorge Bejar2015-12-092-10/+0
| | | | | | | | is the default value for only API apps
| * Make debug_exception_response_format config depends on api_only when is not setJorge Bejar2015-12-092-2/+37
| |
| * Add tests for api_only configuration settingJorge Bejar2015-12-091-0/+15
| |
| * Avoid warning because of the mime typeJorge Bejar2015-12-091-1/+1
| |
| * Do not add format key to request_paramsJorge Bejar2015-12-093-18/+11
| | | | | | | | | | | | | | | | | | I did this change but it is affecting how the request params end up after being processed by the router. To be in the safe side, I just take the format from the extension in the URL when is not present in those params and it's being used only for the `Request#formats` method
| * Adjust comment in development.rb template file for app generatorJorge Bejar2015-12-091-3/+0
| |
| * Update Changelog with the added response_format option in AD::DebugExceptionsJorge Bejar2015-12-092-0/+19
| |
| * debug_exception_response_format needs to be writeable in ConfigurationJorge Bejar2015-12-091-2/+2
| |
| * Fix indent in generated Rails API env fileJorge Bejar2015-12-091-6/+6
| |
| * Mention the debug_exception_response_format config in guidesJorge Bejar2015-12-091-0/+8
| |
| * DebugException initialize with a response_format valueJorge Bejar2015-12-093-9/+10
| |
| * Add debug_exception_response_format config to configure DebugExceptionJorge Bejar2015-12-093-30/+43
| | | | | | | | behavior
| * Better name for method in DebugExceptions middlewareJorge Bejar2015-12-091-2/+2
| |
| * Improve regexp in AC::Http::ParametersJorge Bejar2015-12-091-1/+1
| |
| * Minor cleanup in AD::DebugExceptionsJorge Bejar2015-12-091-6/+9
| |
| * Remove unneeded args in AD::DebugExceptionsJorge Bejar2015-12-091-1/+0
| |
| * New hash syntax in AD::DebugExceptionsJorge Bejar2015-12-091-4/+4
| |
| * Fix some edge cases in AD::DebugExceptions in rails api appsJorge Bejar2015-12-092-52/+126
| |
| * Do not include web-console in Rails API appsJorge Bejar2015-12-091-0/+2
| |
| * Response when error should be formatted properly in Rails API if local requestJorge Bejar2015-12-096-10/+44
| |
| * Use URL path extension as format in bad params exception handlingJorge Bejar2015-12-082-3/+32
| |
* | Fix `make_response!` when called by `serve` in `RouteSet`eileencodes2015-12-092-6/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All of our tests were testing the `ActionController::Live` behavior in a standalone environment, without going through the router or behaving like a real application. This resulted in `ActionController::Live` throwing the exception `undefined method 'request' for #<ActionDispatch::Request:0x00000003ad1148>` because `make_response!` was expecting a response instead of a request. The expectation of a response came from `set_response!` in non-router tests setting the response and passing it to `make_response!`. In the case of an application we would hit `serve` in `RouteSet` first which would send us to `make_response!` with a request sent instead of a response. The changes here remove `set_response!` so `make_response!` always receives a request. Thanks to KalabiYau for help with the investigation and solution. Fixes #22524 [Eileen M. Uchitelle & KalabiYau]
* | renames AS::FileEventedUpdateChecker to AS::EventedFileUpdateCheckerXavier Noria2015-12-093-6/+6
|/ | | | Better English.
* Merge pull request #22248 from arekf/issue-22232Kasper Timm Hansen2015-12-072-1/+10
|\ | | | | Fix #22232: rake test tasks exit status code
| * Fix #22232: rake test tasks exit status codeArkadiusz Fal2015-12-072-1/+10
|/ | | | | | | The exit status code was not set when tests were fired with `rake`. Now, it is being set and it matches behavior of running tests via `rails` command (`rails test`), so no matter if `rake test` or `rails test` command is used the exit code will be set.
* Clarify the need to run command twice.Kasper Timm Hansen2015-12-071-2/+2
| | | | | We had 2 pull requests erronously trying to remove the first command. Add some comments for clarity.
* Change the `protect_from_forgery` prepend default to `false`eileencodes2015-12-073-9/+32
| | | | | | | | | | | | | | | | | | | | | Per this comment https://github.com/rails/rails/pull/18334#issuecomment-69234050 we want `protect_from_forgery` to default to `prepend: false`. `protect_from_forgery` will now be insterted into the callback chain at the point it is called in your application. This is useful for cases where you want to `protect_from_forgery` after you perform required authentication callbacks or other callbacks that are required to run after forgery protection. If you want `protect_from_forgery` callbacks to always run first, regardless of position they are called in your application, then you can add `prepend: true` to your `protect_from_forgery` call. Example: ```ruby protect_from_forgery prepend: true ```
* Merge pull request #22508 from ↵Santiago Pastorino2015-12-072-0/+2
|\ | | | | | | | | y-yagi/remove_request_forgery_protection_from_rails_api remove `request_forgery_protection` initializer from rails api
| * remove `request_forgery_protection` initializer from rails apiyuuji.yaginuma2015-12-062-0/+2
| | | | | | | | | | In rails api, since default is so as not to use the `protect_from_forgery`, `request_forgery_protection` initializer I think that's unnecessary
* | Merge pull request #22475 from claudiob/missing-requireMatthew Draper2015-12-081-0/+1
|\ \ | | | | | | Add missing require to strong_parameters.rb
| * | Add missing require to strong_parameters.rbclaudiob2015-12-041-0/+1
| | | | | | | | | | | | | | | The file [references Rack::Test here](https://github.com/rails/rails/blame/master/actionpack/lib/action_controller/metal/strong_parameters.rb#L671) so it's better off requiring 'rack/test' in the first place.
* | | Merge pull request #22523 from Elektron1c97/masterRafael França2015-12-071-4/+4
|\ \ \ | | | | | | | | Typo correction
| * | | Typo correctionYves Siegrist2015-12-071-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In the doc the `dependent` option was set with: `dependent: destroy`. This is not working because destroy would call the method of the activerecord::base object. The right way is: `dependent: :destroy`
* | | | Merge pull request #22517 from Elektron1c97/masterRafael França2015-12-077-13/+7
|\| | | | | | | | | | | [ci skip] Add a dollar sign to each command in the READMEs
| * | | [ci skip] Add a dollar sign to each command in the READMEsElektron1c972015-12-067-13/+7
| |/ / | | | | | | | | | | | | | | | According to pr #22443 in the guides there's always a dollar sign before every command, so why is in the main README a `$` and in every submodule a `%`? Just eye candy..
* | | Make sure we touch all the parents when touch_later.Arthur Neves2015-12-064-8/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem was that when saving an object, we would call touch_later on the parent which wont be saved immediteally, and it wont call any callbacks. That was working one level up because we were calling touch, during the touch_later commit phase. However that still didnt solve the problem when you have a 3+ levels of parents to be touched, as calling touch would affect the parent, but it would be too late to run callbacks on its grand-parent. The solution for this, is instead, call touch_later upwards when the first touch_later is called. So we make sure all the timestamps are updated without relying on callbacks. This also removed the hard dependency BelongsTo builder had with the TouchLater module. So we can still have the old behaviour if TouchLater module is not included. [fixes 5f5e6d924973003c105feb711cefdb726f312768] [related #19324]
* | | Only commit the cookie jar if it hasn't been committedeileencodes2015-12-061-1/+1
| | | | | | | | | | | | | | | | | | | | | We don't want to commit the cookie jar more than once because then we will be attempting to modify a frozen hash. Fixes Railties test failure caused by 492b134.
* | | Stop violating law of demeter in response cookie_jareileencodes2015-12-063-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a new method to request and response so we don't need to violate the law of demeter. We are changing `Request` and `Response` so that they always have a `cookie_jar` This is a continuation on work to combine integration and controller test code bases in Rails.
* | | Push `before_sending` to super classeileencodes2015-12-0610-11/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We want to get rid of the `Live::Response` so we are consolidating methods from `Live::Response` and `Response` by merging them together. This adds an `#empty` method to the request so we don't need to hard-code the empty array each time we call an empty `ActionDispatch::Request`. The work here is a continuation on combining controller and integration test code bases into one.
* | | Merge pull request #22516 from gsamokovarov/after-create-update-destroy-commitDavid Heinemeier Hansson2015-12-064-6/+63
|\ \ \ | | | | | | | | Introduce after_{create,update,delete}_commit callbacks
| * | | Introduce after_{create,update,delete}_commit callbacksGenadi Samokovarov2015-12-064-6/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Those are actually shortcuts for `after_commit`. Before: after_commit :add_to_index_later, on: :create after_commit :update_in_index_later, on: :update after_commit :remove_from_index_later, on: :destroy After: after_create_commit :add_to_index_later after_update_commit :update_in_index_later after_destroy_commit :remove_from_index_later
* | | | Merge pull request #22428 from thedarkone/subs-notifEileen M. Uchitelle2015-12-063-4/+24
|\ \ \ \ | | | | | | | | | | Subscribing to notifications while inside the said instrumented section
| * | | | Subscribing to notifications while inside the said instrumented section.thedarkone2015-11-283-4/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The issue is that on the exit from Instrumenter#instrument section, an Evented listener will run into an error because its thread local (Thread.current[:_timestack]) has not been set up by the #start method (this obviously happens because the Evented listeners didn't exist at the time, since no subscribtion to that section was made yet). Note: support for subscribing to instrumented sections, while being inside those instrumented sections, might be removed in the future. Maybe fixes #21873.
* | | | | Merge pull request #22453 from wjessop/use_action_dispatch_default_tld_lengthEileen M. Uchitelle2015-12-061-26/+30
|\ \ \ \ \ | | | | | | | | | | | | Test against the real value of tld_length unless explicitly set
| * | | | | Test against the real value of tld_length unless explicitly setWill Jessop2015-12-041-26/+30
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There were two places where the tld_length default was hard-coded to 1, both overriding the real default value of ActionDispatch::Http::URL.tld_length in this set of tests. This commit removes both of those, relying on the actual value of ActionDispatch::Http::URL.tld_length, unless it's specifically overridden.
* | | | | Merge pull request #22480 from keepcosmos/add-translate-testEileen M. Uchitelle2015-12-061-0/+5
|\ \ \ \ \ | | | | | | | | | | | | add test for namespaced model name translation