aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Prevent leaking of user's DB credentials on `rails db:create` failurebogdanvlviv2018-08-294-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Issue #27852 reports that when `rails db:create` fails, it causes leaking of user's DB credentials to $stderr. We print a DB's configuration hash in order to help users more quickly to figure out what could be wrong with his configuration. This commit changes message from "Couldn't create database for #{configuration.inspect}" to "Couldn't create '#{configuration['database']}' database. Please check your configuration.". There are two PRs that fixing it #27878, #27879, but they need a bit more work. I decided help to finish this and added Author of those PRs credit in this commit. Since it is a security issue, I think we should backport it to `5-2-stable`, and `5-1-stable`. Guided by https://edgeguides.rubyonrails.org/maintenance_policy.html#security-issues Fixes #27852 Closes #27879 Related to #27878 [Alexander Marrs & bogdanvlviv]
* Merge pull request #33718 from kddeisz/permit-listMatthew Draper2018-08-2919-52/+63
|\ | | | | Finish converting whitelist and blacklist references
| * Permit list usage cleanup and clearer documentationKevin Deisz2018-08-2715-40/+41
| |
| * Convert remaining usage of whitelist and blacklistKevin Deisz2018-08-245-14/+14
| |
| * Deprecate usage of ActionView::Template::Handlers::ERB::escape_whitelistKevin Deisz2018-08-241-2/+12
| |
| * Convert over the rest of the blacklist referencesKevin Deisz2018-08-241-2/+2
| |
| * Convert over the rest of the whitelist referencesKevin Deisz2018-08-2413-25/+25
| |
* | Generate the same value as a label of view in system test templateyuuji.yaginuma2018-08-292-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the system test template, enter a value based on label. However, since `label` method does not use `titleize` by default. If generate a value including underscore, cannot find a label and the test will fail. ``` $ ./bin/rails g scaffold user name:string phone_number:string $ ./bin/rails t test/system/users_test.rb E Error: UsersTest#test_creating_a_User: Capybara::ElementNotFound: Unable to find field "Phone Number" test/system/users_test.rb:18:in `block in <class:UsersTest>' ``` This removes unnecessary `titleize` so that the generated file will pass even if the attribute contains an underscore.
* | Add test to make sure the custom object key can't be serializedRafael Mendonça França2018-08-281-2/+4
| |
* | Focus search input after page load on /rails/info/routes (#33683)James Brooks2018-08-281-0/+3
| |
* | Merge pull request #33739 from tleneveu/edgeguides-https-linksRyuta Kamizono2018-08-283-4/+4
|\ \ | | | | | | Use the HTTPS protocol for links to Edges Guides [ci skip]
| * | Use the HTTPS protocol for links to Edges Guides [ci skip]tleneveu2018-08-283-4/+4
| | | | | | | | | | | | Edges Guides is now available in HTTPS, it would be better to use the HTTPS protocol directly.
* | | Merge pull request #33689 from ypresto/ar-fix-dirty-in-aroundRyuta Kamizono2018-08-282-5/+26
|\ \ \ | |/ / |/| | Mutation tracker should be cleared before continuing around callbacks
| * | Mutation tracker should be cleared before continuing around callbacksYuya Tanaka2018-08-282-5/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `changes_applied` should be called before continuing around callback chain. Otherwise the mutation tracker returns old value for methods like `changed`? or `id_in_database` in around callbacks. Also methods depend on `id_in_database`, like `update_column`, are not working in `around_create` callbacks. ``` class Foo < ActiveRecord::Base around_create :around_create_callback def around_create_callback ... yield p id_in_database # => nil update_column(:generated_column, generate_value) # silently fails end ... end ```
* | | Update the comments for TimeWithZone subtraction (#33721)Rob Race2018-08-281-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Update the comments for TimeWithZone subtraction While reading the description/documentation comments for the subtraction method, it was confusing. While in practical usage, the returned values make sense. It seems as though the explanation could be a bit clearer. * Removed erroneous closing parenthesis [ci skip] [Rob Race + Ryuta Kamizono]
* | | Merge pull request #33654 from kamipo/fix_numericality_validator_2Ryuta Kamizono2018-08-284-4/+41
|\ \ \ | |/ / |/| | Fix numericality validator to still use value before type cast except Active Record
| * | Fix numericality validator to still use value before type cast except Active ↵Ryuta Kamizono2018-08-244-4/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Record The purpose of fe9547b is to work type casting to value from database. But that was caused not to use the value before type cast even except Active Record. There we never guarantees that the value before type cast was going to the used in this validation, but we should not change the behavior unless there is some particular reason. To restore original behavior, still use the value before type cast if `came_from_user?` is undefined (i.e. except Active Record). Fixes #33651. Fixes #33686.
* | | 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.