aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | Merge pull request #25367 from ↵Rafael França2016-06-112-1/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stephenminded/active_job_test_helper_custom_queue_adapter Provide the ability to override the queue adapter used by jobs under test
| * | | | | | | | | | | | | | Provide the ability to override the queue adapter used by jobs underSteve Lounsbury2016-06-112-1/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test. This PR adds a method called `queue_adapter_for_test` to `ActiveJob::TestHelper`. This method is expected to provide the queue adapter to be used for jobs under test. It maintains the current behaviour by defaulting to an instance of `ActiveJob::QueueAdapter::TestAdapter`. Tests that include `ActiveJob::TestHelper` or extend from `ActiveJob::TestCase` can provide a custom queue adapter by overriding `queue_adapter_for_test` in their class.
* | | | | | | | | | | | | | | Merge pull request #25368 from frodsan/patch-1Rafael França2016-06-111-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | Fix typo
| * | | | | | | | | | | | | | Fix typoFrancesco Rodriguez2016-06-121-1/+1
|/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | | | | | Merge pull request #25363 from kamipo/fix_or_result_sqlVipul A M2016-06-111-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | Fix `or` result SQL [ci skip]
| * | | | | | | | | | | | | Fix `or` result SQL [ci skip]Ryuta Kamizono2016-06-111-1/+1
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #25361 from maclover7/jm-rm-stuffSean Griffin2016-06-101-11/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove `_run_class_setup`
| * | | | | | | | | | | | | Remove `_run_class_setup`Jon Moss2016-06-101-11/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Should have been removed by 3073c531983de243219fb55be93fbcebfdd9c44e.
* | | | | | | | | | | | | | Merge pull request #25321 from prathamesh-sonpatki/update-release-notes-1Rafael França2016-06-101-10/+33
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | Add missing things to release notes [ci skip]
| * | | | | | | | | | | | | Add missing things to release notes [ci skip]Prathamesh Sonpatki2016-06-071-10/+33
| | |/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - https://github.com/rails/rails/pull/18721 - https://github.com/rails/rails/pull/11898 - https://github.com/rails/rails/pull/18194 - https://github.com/rails/rails/pull/18225 - https://github.com/rails/rails/pull/18244 - https://github.com/rails/rails/commit/edc2b7718725016e988089b5fb6d6fb9d6e16882 - https://github.com/rails/rails/pull/19686
* | | | | | | | | | | | | Make sure the yielded variable is the loggerRafael Mendonça França2016-06-102-4/+6
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #25351 from kmcphillips/asset-default-config-quietRafael França2016-06-101-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add config.assets.quiet = true as default for generator
| * | | | | | | | | | | | | Add config.assets.quiet = true as default valueKevin McPhillips2016-06-101-0/+3
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #25341 from kmcphillips/masterRafael França2016-06-103-34/+124
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Broadcast #silence on ActiveSupport::Logger
| * | | | | | | | | | | | | | Be explicit about what Logger class is expectedKevin McPhillips2016-06-091-3/+3
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Broadcast #silence on logger. Rewrite tests.Kevin McPhillips2016-06-092-31/+121
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #25352 from Shopify/optimized-delegateRafael França2016-06-101-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace Kernel#caller by the faster Kernel#caller_locations
| * | | | | | | | | | | | | | | Replace Kernel#caller by the faster Kernel#caller_locationsJean Boussier2016-06-101-2/+2
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #25342 from Edouard-chin/callbacks-wrong-method-nameVipul A M2016-06-101-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | [ci skip] `define_model_callbacks` only exist in active model
| * | | | | | | | | | | | | | [ci skip] `define_model_callbacks` only exist in active model:Edouard CHIN2016-06-101-1/+6
| |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Also added a note when calling multiple time `define_callbacks`
* | | | | | | | | | | | | | Merge pull request #25348 from alexcameron89/masterJon Moss2016-06-101-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | Fix typo in ActionController::Renderer [ci skip]
| * | | | | | | | | | | | | Fix typo in ActionController::Renderer [ci skip]Alex Kitchens2016-06-101-1/+1
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #25338 from jwworth/fix_typo_sucker_punch_1465507047Jon Moss2016-06-091-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | Fix Typo in `SuckerPunchAdapter`
| * | | | | | | | | | | | Fix typo, `of of` -> `of` [ci skip]Jake Worth2016-06-091-1/+1
|/ / / / / / / / / / / /
* | | | | | | | | | | | Remove dead code from testsSean Griffin2016-06-091-17/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This code was added in 81286f858770e0b95e15af37f19156b044ec6a95, but was not used by that commit and does not appear to have ever been used.
* | | | | | | | | | | | render_to_string Regression Outside of Real Requests in Rails 5.0.0.rc1 (#25308)Brandon Medenwald2016-06-092-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Restore the functionality of PR#14129, but do so with not nil to better indicate the purpose of the conditional * Add a test when render_to_string called on ActionController::Base.new()
* | | | | | | | | | | | Merge pull request #25329 from ↵Sean Griffin2016-06-091-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | yahonda/allow_oracle_bind_value_syntax_in_loj_test Allow Oracle bind parameter syntax `:a1` in test_join_conditions_added_to_join_clause
| * | | | | | | | | | | | Allow Oracle bind parameter syntax `:a1`Yasuo Honda2016-06-081-1/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #25334 from abhishekjain16/doc_fixSean Griffin2016-06-091-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo
| * | | | | | | | | | | | | Fix typoAbhishek Jain2016-06-091-2/+2
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #25335 from y-yagi/remove_deprecated_prefix_optionVipul A M2016-06-081-2/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remove deprecated `:prefix` option from doc [ci skip]
| * | | | | | | | | | | | | | remove deprecated `:prefix` option from doc [ci skip]yuuji.yaginuma2016-06-091-2/+0
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The option was deprecated in #21191.
* | | | | | | | | | | | | | Merge pull request #25332 from abhishekjain16/test_fixRafael França2016-06-092-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | existant => existent
| * | | | | | | | | | | | | existant => existentAbhishek Jain2016-06-092-3/+3
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #25315 from schneems/schneems/inclusion-docRichard Schneeman2016-06-081-3/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] Expand information on message options
| * | | | | | | | | | | | | [ci skip] Expand information on message optionsschneems2016-06-081-3/+9
| | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Link to the more detailed message documentation when using a message option in validations.
* | | | | | | | | | | | | Merge pull request #25327 from prathamesh-sonpatki/add-5-0-notes-to-the-indexXavier Noria2016-06-081-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | | Add Rails 5.0 release notes to the index page of guides [ci skip]
| * | | | | | | | | | | | Add Rails 5.0 release notes to the index page of guides [ci skip]Prathamesh Sonpatki2016-06-081-0/+5
| | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - It is also marked as WIP as we are still refining it.
* | | | | | | | | | | | Merge pull request #25323 from vipulnsward/ac-release-notesDavid Heinemeier Hansson2016-06-081-2/+13
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Add Action Cable introduction to release notes
| * | | | | | | | | | | | Add Action Cable introduction to release notes [ci skip]Vipul A M2016-06-071-2/+13
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #25281 from maclover7/jm-add-internalSean Griffin2016-06-073-1/+37
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | | `{ internal: true }` from being stored in the router
| * | | | | | | | | | | | Prevent `{ internal: true }` from being stored in the routerJon Moss2016-06-073-1/+37
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Forgotten followup to #23669 :grimacing: If you went to an internal route (e.g. `/rails/info/routes`), you would previously see the following in your logger: ```bash Processing by Rails::InfoController#routes as HTML Parameters: {"internal"=>true} Rendering /Users/jon/code/rails/rails/railties/lib/rails/templates/rails/info/routes.html.erb within layouts/application Rendered collection of /Users/jon/code/rails/rails/actionpack/lib/action_dispatch/middleware/templates/routes/_route.html.erb [2 times] (10.5ms) Rendered /Users/jon/code/rails/rails/actionpack/lib/action_dispatch/middleware/templates/routes/_table.html.erb (2.5ms) Rendered /Users/jon/code/rails/rails/railties/lib/rails/templates/rails/info/routes.html.erb within layouts/application (23.5ms) Completed 200 OK in 50ms (Views: 35.1ms | ActiveRecord: 0.0ms) ``` Now, with this change, you would see: ```bash Processing by Rails::InfoController#routes as HTML Rendering /Users/jon/code/rails/rails/railties/lib/rails/templates/rails/info/routes.html.erb within layouts/application Rendered collection of /Users/jon/code/rails/rails/actionpack/lib/action_dispatch/middleware/templates/routes/_route.html.erb [2 times] (1.6ms) Rendered /Users/jon/code/rails/rails/actionpack/lib/action_dispatch/middleware/templates/routes/_table.html.erb (10.2ms) Rendered /Users/jon/code/rails/rails/railties/lib/rails/templates/rails/info/routes.html.erb within layouts/application (17.4ms) Completed 200 OK in 44ms (Views: 28.0ms | ActiveRecord: 0.0ms) ```
* | | | | | | | | | | | Merge pull request #25317 from prathamesh-sonpatki/fix-api-controller-testsKasper Timm Hansen2016-06-072-7/+7
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Fix API controller tests by assigning them the encoding type
| * | | | | | | | | | | | Fix API controller tests by assigning them the encoding typePrathamesh Sonpatki2016-06-072-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixes #25183. - The `as: :json` feature was added in https://github.com/rails/rails/pull/21671 and recommended to use for JSON endpoints so let's use it by default for API controller tests.
* | | | | | | | | | | | | Merge pull request #25247 from y-yagi/reference_actual_classKasper Timm Hansen2016-06-071-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | reference actual class to use middleware
| * | | | | | | | | | | | | reference actual class to use middlewareyuuji.yaginuma2016-06-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using strings for middleware class names is deprecated in 83b767cef90abfc4c2ee9f4b451b0215501fae9a.
* | | | | | | | | | | | | | Add regression test to `as` option.Kasper Timm Hansen2016-06-071-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Was worried the `as` might impede on users doing the long form JSON response encoding; test for certainty.
* | | | | | | | | | | | | | Merge pull request #25079 from jeffkreeftmeijer/send_file-halts-request-cycleSean Griffin2016-06-074-6/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use `#performed?` to terminate controller callbacks
| * | | | | | | | | | | | | | Delete bad testSean Griffin2016-06-071-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test was broken by f650e0324207e46ed5240380e60bdf1e2a5023a6. It was added by https://github.com/rails/rails/pull/17978, and is adequately tested elsewhere. The reason that this breaks is that `Controller#process` is not going to set a new response object, and we now terminate in callbacks if the response has been sent. The only reason that this test was calling `get` in the first place was because the controller under test blows up if `request` was `nil`. The point being that the failure is invalid, and I don't think we need to fix the test in this location.
| * | | | | | | | | | | | | | Use `#performed?` to terminate controller callbacksJeff Kreeftmeijer2016-06-033-1/+23
| | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since 69009f, `ActionController::Metal::DataStreaming#send_file` doesn't set `@_response_body` anymore. `AbstractController::Callbacks` used `@_response_body` in its callback terminator, so it failed to halt the callback cycle when using `#send_file` from a `before_action`. Instead, it now uses `#performed?` on `AbstractController::Base` and `ActionController::Metal`, which checks `response.committed?`, besides checking if `@_response_body` is set, if possible. Example application: https://gist.github.com/jeffkreeftmeijer/78ae4572f36b198e729724b0cf79ef8e
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 06:01:43 +0000