aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* remove deprecated `:prefix` option from doc [ci skip]yuuji.yaginuma2016-06-091-2/+0
| | | | The option was deprecated in #21191.
* 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
* | | | Flag `to_time` + simplify version names.Kasper Timm Hansen2016-06-071-5/+6
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | Since Ruby 2.4 isn't out yet, the fact that it will make `to_time` preserve the time zone should be toggled with a update flag. Second, remove the flipping on what version had what defaults. It's called new framework defaults, so it's from the future looking. Thus keep the line that mentions past versions.
* | | Merge pull request #25235 from prathamesh-sonpatki/cleanupSean Griffin2016-06-074-50/+32
|\ \ \ | | | | | | | | More cleanup of new framework defaults
| * | | Use the `update` flag to provide more friendlier messages to people upgrading.Prathamesh Sonpatki2016-06-071-12/+9
| | | |
| * | | Remove FORCE option as it was only needed for testsPrathamesh Sonpatki2016-06-072-2/+4
| | | | | | | | | | | | | | | | - Adjusted tests instead.
| * | | Update the documentation of new_framework_defaults file with more details ↵Prathamesh Sonpatki2016-06-041-13/+16
| | | | | | | | | | | | | | | | | | | | | | | | about old apps and how you can upgrade to new defaults. [Kasper Timm Hansen, Prathamesh Sonpatki]
| * | | Fix minor regression about old apps not getting per_form_csrf and ↵Prathamesh Sonpatki2016-06-044-25/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | request_forgery_protection configs - Earlier per_form_csrf_tokens and request_forgery_protection config files were generated for old apps upgraded to Rails 5. - But when we collapsed all initializers into one file, the entire file does not get created for old apps. - This commit fixes it and also changes values for all new defaults for old apps so that they will not break. - Also added a test for `rails app:update`.
| * | | More cleanup of new framework defaultsPrathamesh Sonpatki2016-06-041-18/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Move real new default options to the top of the file. - After that club together all the options which were added to keep backward compatibility. So all of them will get only one header. - Based on https://github.com/rails/rails/pull/25231#issuecomment-222945173.
* | | | Merge pull request #25265 from opti/improve/hash_compactKasper Timm Hansen2016-06-072-5/+16
|\ \ \ \ | | | | | | | | | | Improve Hash#compact! documentation and tests
| * | | | Improve Hash#compact! documentation and testsIgor Pstyga2016-06-032-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make it clear what should be returned when no changes were made to the hash. { c: true }.compact! # => nil
* | | | | Merge pull request #25311 from jhass/openssl_verify_modeVipul A M2016-06-073-5/+4
|\ \ \ \ \ | | | | | | | | | | | | Do not suggest nonsensical OpenSSL verify modes
| * | | | | Do not suggest nonsensical OpenSSL verify modes [ci skip]Jonne Haß2016-06-073-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SSL_set_verify(3) explains: SSL_VERIFY_FAIL_IF_NO_PEER_CERT Server mode: if the client did not return a certificate, the TLS/SSL handshake is immediately terminated with a "handshake failure" alert. This flag must be used together with SSL_VERIFY_PEER. Client mode: ignored SSL_VERIFY_CLIENT_ONCE Server mode: only request a client certificate on the initial TLS/SSL handshake. Do not ask for a client certificate again in case of a renegotiation. This flag must be used together with SSL_VERIFY_PEER. Client mode: ignored The SMTP connection here uses a OpenSSL socket in client mode, suggesting invalid/ignored flags is rather misleading.
* | | | | | Merge pull request #25309 from maclover7/jm-bump-nokogiriSean Griffin2016-06-072-9/+13
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Require Nokogiri >= 1.6.8
| * | | | | Require Nokogiri >= 1.6.8Jon Moss2016-06-062-9/+13
| | | | | | | | | | | | | | | | | | | | | | | | per security release today --> https://groups.google.com/forum/#!topic/ruby-security-ann/RCHyF5K9Lbc
* | | | | | Merge pull request #25294 from Zorbash/cache-fetch-race-condition-ttl-docVipul A M2016-06-061-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Change doc for race_condition_ttl option of ActiveSupport::Cache::Sto… [ci skip]
| * | | | | Change doc for race_condition_ttl option of ↵Dimitris Zorbas2016-06-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActiveSupport::Cache::Store#fetch [ci skip] The related option of this method, `expires_in` is documented as expecting an `ActiveSupport::Duration` value. To minimize any sort of ambiguity between duration options, this change also documents `race_condition_ttl` accepting `ActiveSupport::Duration`.
* | | | | | Merge pull request #25283 from javan/actioncable/blade-on-eventmachine1-2Jeremy Daer2016-06-062-12/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | Action Cable: Fix CI tests on Sauce Labs
| * | | | | | Update Blade and its Sauce Labs plugin for EventMachine 1.2 compatibilityJavan Makhmali2016-06-042-12/+12
| | | | | | |
* | | | | | | Merge pull request #25279 from maclover7/jm-add-backticks-1David Heinemeier Hansson2016-06-061-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add backticks to `ActiveRecord::Base.where`
| * | | | | | | Add backticks to `ActiveRecord::Base.where`Jon Moss2016-06-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | Merge pull request #25298 from alexcameron89/masterप्रथमेश Sonpatki2016-06-062-2/+2
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | [ci skip] Update redirecting links in guides
| * | | | | | | [ci skip] Update redirecting links in guidesAlex Kitchens2016-06-062-2/+2
|/ / / / / / /
* | | | | | | Merge pull request #25292 from jwworth/fix_time_field_typo_1465154852Vipul A M2016-06-051-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix a typo in `time_field` [ci skip]
| * | | | | | | Fix a typo in `time_field` [ci skip]Jake Worth2016-06-051-1/+1
| | | | | | | |
* | | | | | | | Merge pull request #24071 from meinac/configuring_md_docsVipul A M2016-06-051-0/+26
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Added some useful configuration options into configuring.md [ci skip]
| * | | | | | | Added some useful configuration options into configuring.md [ci skip]Mehmet Emin İNAÇ2016-03-051-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added information about inserting middlewares with indexes. I think this information useful. We can use indexes also for `insert_after` but the behavior is not same and this is not the right place to give full information about all configuration options. The configuration for I18n fallbacks is important for production environment. Especially using different fallbacks for different locales.
* | | | | | | | Merge pull request #25282 from prathamesh-sonpatki/trim-ac-readmeKasper Timm Hansen2016-06-041-156/+5
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | Trim Action Cable README [ci skip]
| * | | | | | | Added "Download and Installation" section to Action Cable README [ci skip]Prathamesh Sonpatki2016-06-041-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Only Action Cable README did not have this section, all of the other READMEs have this section.
| * | | | | | | Trim Action Cable README [ci skip]Prathamesh Sonpatki2016-06-041-161/+0
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Remove "Configuration", "Running the server", "Dependencies" and "Deployment" sections from the Action Cable README as they are already duplicated in the Action Cable overview guide.
* | | | | | | Merge pull request #25278 from mechanicles/fix-linkJon Moss2016-06-041-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [ci skip] Fix link rubyonrails.org/core => http://rubyonrails.org/community
| * | | | | | | [ci skip] Fix link rubyonrails.org/core => http://rubyonrails.org/community.Santosh Wadghule2016-06-041-1/+1
| | | | | | | |
* | | | | | | | Merge pull request #25277 from mechanicles/remove-pratik-from-coreJon Moss2016-06-041-1/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | [ci skip] Remove Pratik Naik from Rails core team info.
| * | | | | | | [ci skip] Remove Pratik Naik from Rails core team info.Santosh Wadghule2016-06-041-1/+1
| |/ / / / / /
* | | | | | | Merge pull request #25272 from kamipo/fix_sqlite3_test_failureEileen M. Uchitelle2016-06-042-3/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix sqlite3 test failure
| * | | | | | | Fix sqlite3 test failureRyuta Kamizono2016-06-042-3/+3
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Sqlite3 test failure is due to 66ebbc4952f6cfb37d719f63036441ef98149418.
* | | / / / / Dont re-define class SQLite3Adapter on testArthur Neves2016-06-032-108/+98
| |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were declaring in a few tests, which depending of the order load will cause an error, as the super class could change. see https://github.com/rails/rails/commit/ac1c4e141b20c1067af2c2703db6e1b463b985da#commitcomment-17731383
* | | | | | Merge pull request #25263 from abhishekjain16/doc_accessor_threadEileen M. Uchitelle2016-06-031-2/+2
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | [skip ci] Fix grammar
| * | | | | [skip ci] Fix grammarAbhishek Jain2016-06-031-2/+2
| | |_|/ / | |/| | |
* | | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2016-06-0314-52/+40
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Conflicts: guides/source/action_cable_overview.md
| * | | | Grammar fixes for Contributing guideJon Moss2016-06-021-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not sure why #25239, but it had good changes, so I'm manually pulling in the changes. [Jon Moss, Rajat Bansal] [ci skip]
| * | | | `will be` --> `is`Jon Moss2016-05-311-1/+1
| | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | Light edits to Action Cable Overview guideJon Moss2016-05-281-3/+3
| | | | | | | | | | | | | | | | | | | | [ci skip]
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-04 14:54:52 +0000