aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Call block to #redirect_to in controller context (#33735)speckins2018-08-272-1/+17
| | | | | | | | | | | | | | | | | | * Call block to #redirect_to in controller context The documentation for ActionController::Redirecting states that a Proc argument "will be executed in the controller's context." However, unless #instance_eval is used (removed in 6b3ad0ca), that statement is false for procs defined outside of the controller instance. This commit restores the documented behavior. Fixes #33731. * Move test proc into a constant in another class Per @rafaelfranca's suggestion. [Steven Peckins + Rafael Mendonça França]
* Add documentation for `:collation` column option (#33733)Nate Pinsky2018-08-271-0/+3
| | | | | | | | | | | | | * Add documentation for `:collation` option The table definition supports a `:collation` option for string and text columns, but this is not documented anywhere that I could find. I'm not sure if the "If not specified" part is accurate. From [this PR](https://github.com/rails/rails/commit/1515c4d98da3f730ef971fa5a13cad828bd9bef4), it looks like it passes `nil` and lets the database handle the collation, but I'm happy to change it if I misread the code. [ci skip] * FIX remove whitespace [Nate Pinsky + Rafael Mendonça França]
* Merge pull request #31972 from bogdanvlviv/update-form_helpers-guideRafael França2018-08-271-96/+118
|\ | | | | Update "Action View Form Helpers" guide
| * Update "Action View Form Helpers" guide [ci skip]bogdanvlviv2018-08-271-96/+118
|/
* Merge pull request #33727 from bogdanvlviv/follow-up-33523Ryuta Kamizono2018-08-272-50/+23
|\ | | | | Follow up #33523 [ci skip]
| * Add `:namespace` option to the api docs of `form_with` [ci skip]bogdanvlviv2018-08-271-0/+3
| |
| * Follow up #33523 [ci skip]bogdanvlviv2018-08-271-50/+20
| | | | | | | | | | | | | | | | | | | | | | This commit is the next work after #33523. Also, this commit removes mention about hidden `utf8` input. Since form helpers don't generate this input by default since #32125. Note that I also had created PR #31972 with improvements to "Action View Form Helpers" guide, but I'll rebase it after merging the current PR.
* | Remove unused requiresRyuta Kamizono2018-08-251-3/+1
| |
* | Merge pull request #33723 from pinewong/patch-3Matthew Draper2018-08-251-2/+2
|\ \ | | | | | | Clarify example of the test [ci skip]
| * | Clarify example of the test [ci skip] 黄松2018-08-251-2/+2
|/ / | | | | ActionDispatch::TestProcess::FixtureFile
* | Merge pull request #33661 from jychen7/33428-test-has-many-association-enumRyuta Kamizono2018-08-251-0/+22
|\ \ | |/ |/| Add test case to test enum in has_many
| * Add test case to test enum in has_manyRich2018-08-251-0/+22
| | | | | | | | | | | | There is test in has_one to test enum, but there is no for has_many. [Rich Chen]
* | Merge pull request #33722 from robzolkos/docfix-mime-respondsRyuta Kamizono2018-08-251-1/+1
|\ \ | | | | | | Format respond_to method as code in doc [ci skip]
| * | Format respond_to method as code in doc [ci skip]Rob Zolkos2018-08-251-1/+1
|/ / | | | | | | | | This updates the `respond_to` method to be code formatted rather than plain text (as it refers to the method)
* | Avoid `pg` 1.1.0 for nowyuuji.yaginuma2018-08-252-3/+3
| | | | | | | | | | | | | | | | Because there are tests that fail due to the influence of the `async_exec` deprecate message. https://travis-ci.org/rails/rails/jobs/420345370 Related to #33188.
* | Merge pull request #33714 from cbothner/azure-service-swallowing-all-errorsGeorge Claghorn2018-08-242-5/+14
|\ \ | | | | | | Handle only specifically relevant Azure HTTPErrors ActiveStorage::Service::AzureStorageService#upload and #delete
| * | Handle only specifically relevant Azure HTTPErrorsCameron Bothner2018-08-232-5/+14
|/ / | | | | | | | | | | | | | | | | The Azure gem uses `Azure::Core::Http::HTTPError` for everything: checksum mismatch, missing object, network unavailable, and many more. (https://www.rubydoc.info/github/yaxia/azure-storage-ruby/Azure/Core/Http/HTTPError). Rescuing that class obscures all sorts of configuration errors. We should check the type of error in those rescue blocks, and reraise when needed.
* | Revert "Merge pull request #33667 from ↵George Claghorn2018-08-232-20/+7
| | | | | | | | | | | | | | cbothner/azure-service-swallowing-all-errors" This reverts commit b204d167c5cfebd59f771d406178e371811ac43a, reversing changes made to de6a200f82a3de399fa685d583503bc88dbc5e9f.
* | Merge pull request #33667 from cbothner/azure-service-swallowing-all-errorsGeorge Claghorn2018-08-232-7/+20
|\ \ | | | | | | Handle only specifically relevant Azure HTTPErrors in ActiveStorage::Service::AzureStorageService
| * | Handle only specifically relevant Azure HTTPErrorsCameron Bothner2018-08-232-7/+20
|/ / | | | | | | | | | | | | | | | | The Azure gem uses `Azure::Core::Http::HTTPError` for everything: checksum mismatch, missing object, network unavailable, and many more. (https://www.rubydoc.info/github/yaxia/azure-storage-ruby/Azure/Core/Http/HTTPError). Rescuing that class obscures all sorts of configuration errors. We should check the type of error in those rescue blocks, and reraise when needed.
* | Merge pull request #33681 from minaslater/replace-white-and-blacklistAaron Patterson2018-08-239-40/+41
|\ \ | | | | | | [ci skip] change all instances of blacklist and whitelist to denylist…
| * | [ci skip] corrects more grammar awkwardness, replacing denylist with ↵Mina Slater2018-08-229-37/+41
| | | | | | | | | | | | restricted list and consistently use permitted
| * | [ci skip] revert terminology related to syntaxMina Slater2018-08-221-1/+1
| | |
| * | [ci skip] fixes a few more grammar issues, changing a to an before the word ↵Mina Slater2018-08-224-12/+9
| | | | | | | | | | | | allowlist
| * | [ci skip] fixes awkward grammarMina Slater2018-08-226-12/+12
| | |
| * | [ci skip] change all instances of blacklist and whitelist to denylist and ↵Mina Slater2018-08-2111-40/+40
| | | | | | | | | | | | allowlist
* | | Merge pull request #31696 from BrentWheeldon/bmw-connection-pool-load-deadlockMatthew Draper2018-08-242-1/+41
|\ \ \ | |_|/ |/| | Prevent deadlocks when waiting for connection from pool.
| * | Prevent deadlocks when waiting for connection from pool.Brent Wheeldon2018-03-232-1/+41
| | | | | | | | | | | | | | | When a thread that had the load interlock but was blocked waiting to check a connection out of the connection pool but all of the threads using the available connections were blocked waiting to obtain the load interlock an `ActiveRecord::ConnectionTimeoutError` exception was be thrown by the thread waiting for the connection. When waiting for the connection to check out we should allow loading to proceed to avoid this deadlock.
* | | Merge pull request #33703 from bogdanvlviv/follow-up-33659George Claghorn2018-08-235-6/+17
|\ \ \ | | | | | | | | Follow up #33659
| * | | DRY in `assert_broadcasts`bogdanvlviv2018-08-232-2/+13
| | | | | | | | | | | | | | | | Test `assert_no_broadcasts` failure
| * | | Simplify configuring of `ActionCable.server.config.logger` for actioncable testsbogdanvlviv2018-08-231-1/+1
| | | | | | | | | | | | | | | | See `git grep "= Logger.new(nil)"`
| * | | Set the test adapter for the test environment by default in `config/cable.yml`bogdanvlviv2018-08-231-1/+1
| | | |
| * | | Clarify api docs of ActionCable::SubscriptionAdapter::Testbogdanvlviv2018-08-232-2/+2
| | | | | | | | | | | | | | | | Remove extra `:nodoc:` comment since private methods doesn't require that.
* | | | Fix typo s/Topic/Tag/Ryuta Kamizono2018-08-231-1/+1
| | | | | | | | | | | | | | | | `Topic` isn't loaded in this test file.
* | | | Merge pull request #33704 from matthewd/helper-path-with-sizeMatthew Draper2018-08-231-2/+1
|\ \ \ \ | | | | | | | | | | Use string lengths instead of regexp to extract path
| * | | | Use string lengths instead of regexp to extract pathMatthew Draper2018-08-231-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The regexp was introduced in 186ac4cdaa911a9af659a29f2179a19b99dea13b, and looks cosmetic. While they should be functionally identical in theory, in practice, case insensitive (but preserving) filesystems can give results that are differently-cased from the pattern we supplied. I don't know how to force the filesystem to do the surprising thing, even when running in an environment that _could_, so no new test.
* | | | | Merge pull request #32647 from eugeneius/lazy_transactionsMatthew Draper2018-08-2317-17/+185
|\ \ \ \ \ | | | | | | | | | | | | Omit BEGIN/COMMIT statements for empty transactions
| * | | | | Omit BEGIN/COMMIT statements for empty transactionsEugene Kenny2018-08-1317-17/+185
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a transaction is opened and closed without any queries being run, we can safely omit the `BEGIN` and `COMMIT` statements, as they only exist to modify the connection's behaviour inside the transaction. This removes the overhead of those statements when saving a record with no changes, which makes workarounds like `save if changed?` unnecessary. This implementation buffers transactions inside the transaction manager and materializes them the next time the connection is used. For this to work, the adapter needs to guard all connection use with a call to `materialize_transactions`. Because of this, adapters must opt in to get this new behaviour by implementing `supports_lazy_transactions?`. If `raw_connection` is used to get a reference to the underlying database connection, the behaviour is disabled and transactions are opened eagerly, as we can't know how the connection will be used. However when the connection is checked back into the pool, we can assume that the application won't use the reference again and reenable lazy transactions. This prevents a single `raw_connection` call from disabling lazy transactions for the lifetime of the connection.
* | | | | | Merge pull request #33696 from bogdanvlviv/follow-up-44007c070Kasper Timm Hansen2018-08-234-10/+10
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Use `say`/`error` instead of `puts`/`$stderr.puts`
| * | | | | Use `say`/`error` instead of `puts`/`$stderr.puts`bogdanvlviv2018-08-224-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | Follow up 44007c07098a3c633180881cae9285da4622e63f
* | | | | | Merge pull request #33666 from ↵George Claghorn2018-08-229-18/+118
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | cbothner/fail-gracefully-from-activestorage-file-not-found Fail more gracefully from ActiveStorage missing file exceptions
| * | | | | | Respond with 404 in ActiveStorage::DiskController#show when file missingCameron Bothner2018-08-213-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `ActiveStorage::DiskController#show` generates a 404 Not Found response when the requested file is missing from the disk service. It previously raised `Errno::ENOENT`.
| * | | | | | Translate service-specific missing object exceptions into a generic oneCameron Bothner2018-08-217-18/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `ActiveStorage::Blob#download` and `ActiveStorage::Blob#open` raise `ActiveStorage::FileNotFoundError` when the corresponding file is missing from the storage service. Services translate service-specific missing object exceptions (e.g. `Google::Cloud::NotFoundError` for the GCS service and `Errno::ENOENT` for the disk service) into `ActiveStorage::FileNotFoundError`.
* | | | | | | Include form_with in form_helpers rails guide (#33523)Nick Schwaderer2018-08-221-53/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Include form_with in form_helpers rails guide * Include form_tag and form_for footnote * Id and class attributes are not wrapped anymore * Include note that all form_with forms are remote:true by default * Underline most common use case of form_with is with arguments * Form_with no longer accepts multiple hashes in form helper calls * Review final sections * Revert extra documentation * Remove unnecessary link
* | | | | | | Merge pull request #33698 from bogdanvlviv/follow-up-33693Rafael França2018-08-221-1/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Remove extra execution of `uniq!` on action_methods
| * | | | | | | Remove extra execution of `uniq!` on action_methodsbogdanvlviv2018-08-221-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Execution of `to_set` below should remove duplicated elements. Follow up #33693
* | | | | | | | Merge pull request #33695 from peterzhu2118/masterRafael França2018-08-222-8/+11
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Update ParameterFilter to yield original parameters
| * | | | | | | Update ParameterFilter to yield original parametersPeter Zhu2018-08-222-8/+11
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #33693 from schneems/schneems/action_methodsRichard Schneeman2018-08-221-1/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Two fewer array allocations on action_methods
| * | | | | | | Two fewer array allocations on action_methodsschneems2018-08-221-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of creating new arrays for `uniq` and `map` we can instead modify the array in place.