aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #36564 from rodrei/docs-active-starage-warningRafael França2019-07-242-0/+6
|\ | | | | Update docs with warning on ActiveStorage Content-Disposition override
| * Update docs with warning on AS Content-Disposition override [ci skip]Rodrigo Pavano2019-06-271-0/+4
| |
| * Updated ActiveStorage docs by adding missing config [ci skip]Rodrigo Pavano2019-06-271-0/+2
| |
* | Merge pull request #36580 from Shopify/schema-cache-deuplication-from-databaseRafael França2019-07-241-5/+15
|\ \ | | | | | | Also deduplicate schema cache structure when they are read from the database
| * | Also deduplicate schema cache structure when they are read from the databaseJean Boussier2019-07-011-5/+15
| | |
* | | Merge pull request #36524 from ↵Rafael França2019-07-241-0/+2
|\ \ \ | | | | | | | | | | | | | | | | okuramasafumi/add-middleware-command-to-command-line-guide Add `rails initializers` and `rails middleware` to miscellaneous section in Rails Command Line guide [ci skip]
| * | | Add some commands to misc section in CLI guideOKURA Masafumi2019-06-201-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add these two command: * `rails initializers` * `rails middleware`
* | | | Merge pull request #36715 from peterzhu2118/azure-content-typeEileen M. Uchitelle2019-07-242-2/+16
|\ \ \ \ | | | | | | | | | | Add content_type to upload method for Azure
| * | | | Add content_type to upload in AzurePeter Zhu2019-07-242-2/+16
| | | | |
* | | | | Merge pull request #36671 from ↵Eileen M. Uchitelle2019-07-245-1/+37
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | wjessop/do_not_validate_non_dirty_association_targets Don't validate non dirty association targets
| * | | | | Don't validate non dirty association targetsWill Jessop2019-07-155-1/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #36581. This fixes an issue where validations would return differently when a previously saved invalid association was loaded between calls: assert_equal true, squeak.valid? assert_equal true, squeak.mouse.present? assert_equal true, squeak.valid? Here the second assert would return Expected: true Actual: false Limiting validations to associations that would be normally saved (using autosave: true) due to changes means that loading invalid associated relations will not change the return value of the parent relations's `valid?` method.
* | | | | | Merge pull request #34218 from eliotsykes/filter-common-sensitive-paramsRafael França2019-07-241-1/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add common sensitive names to generated filter parameters
| * | | | | | Add common sensitive names to generated filter parametersEliot Sykes2018-11-201-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These added names are distilled from the filter_parameters config of a number of open source Rails applications.
| * | | | | | Add secret to generated filter parametersEliot Sykes2018-11-201-1/+1
| | | | | | |
* | | | | | | Merge pull request #36434 from Edouard-chin/ec-securecompare-rotationRafael França2019-07-242-0/+96
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Introduce a new ActiveSupport::SecureCompareRotator class:
| * | | | | | | Introduce a new ActiveSupport::SecureCompareRotator class:Edouard CHIN2019-06-062-0/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - This class is used to rotate a previously determined value to a new one before making the comparions. We use this at Shopify to rotate Basic Auth crendials but I can imagine other use cases. The implementation uses the same `Messages::Rotator` module than the MessageEncryptor/MessageVerifier class so it works exactly the same way. You can use it as follow: ```ruby rotator = ActiveSupport::SecureCompareRotator.new('new_production_value') rotator.rotate('previous_production_value') rotator.secure_compare!('previous_production_value') ```
* | | | | | | | Merge pull request #36467 from spk/add-doc-host-protocol-asset_pathRafael França2019-07-241-0/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add documentation on actionview asset_path with host and protocol
| * | | | | | | | Add documentation on actionview asset_path with host and protocolLaurent Arnoud2019-06-121-0/+2
| | | | | | | | |
* | | | | | | | | Merge pull request #36749 from sergey-alekseev/patch-1Rafael França2019-07-241-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | fix a typo in 5_2_release_notes.md
| * | | | | | | | | fix a typo in 5_2_release_notes.mdSergey Alekseev2019-07-241-1/+1
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | Merge pull request #36741 from Edouard-chin/ec-system-test-url-optionsEileen M. Uchitelle2019-07-242-5/+52
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Define the `url_options` needed for SytemTest inside the route proxy:
| * | | | | | | | | Define the `url_options` needed for SytemTest inside the route proxy:Edouard CHIN2019-07-242-5/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - I made a change in https://github.com/rails/rails/pull/36691 to delegate route helper to a proxy class. This didn't take into account that the `url_options` we redefine in SystemTest would be ignored. This PR fixes that by definin the url_options inside the proxy
* | | | | | | | | | Merge pull request #36744 from freeletics/fix-db-prepareEileen M. Uchitelle2019-07-242-3/+20
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Fixed db:prepare task to not touch schema when it is disabled
| * | | | | | | | | | Fixed db:prepare task to not touch schema when dump_schema_after_migration ↵Wojciech Wnętrzak2019-07-242-3/+20
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is false.
* | | | | | | | | | Merge pull request #36746 from ↵Ryuta Kamizono2019-07-241-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | abhaynikam/36738-followup-to-fix-typo-in-deprecation-message Fixed the typo in the deprecation error messages. `Erors` -> `Errors`
| * | | | | | | | | | Fixed the typo in the deprecation error messages. Followup #36738Abhay Nikam2019-07-231-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Fix broken rdoc for UrlHelper [ci skip]Ryuta Kamizono2019-07-241-6/+6
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix unintentionally linked String, Symbol, Hash, and ERB. * Fix unintentionally code block.
* | | | | | | | | | Merge pull request #36370 from ptoomey3/masterRafael França2019-07-232-1/+13
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Add support for Proc based parameter filtering on arrays of values
| * | | | | | | | | | Update activesupport/test/parameter_filter_test.rb Patrick Toomey2019-07-231-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove extra newline. Co-Authored-By: Rafael França <rafael@franca.dev>
| * | | | | | | | | | Use style consistent with surrounding codePatrick Toomey2019-05-311-3/+1
| | | | | | | | | | |
| * | | | | | | | | | Fix typoPatrick Toomey2019-05-311-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Recursively process arrays consistentlyPatrick Toomey2019-05-311-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Based on the way parameters are currently processed, a parameter value of type Hash is recursively processed. For a value of type Array however, the current behavior is to simply return the original array, with no filtering. It is not clear what the expected behavior should be. But, doing nothing seems incorrect, since it bypasses custom Proc based parameter filtering all together for arrays of values. This change processes values of type Array consistently. We map over the values and recursively call value_for_key on them. This still works with values of type Hash, since value_for_key already knows how to process Hash values.
| * | | | | | | | | | Add failing test for array values and procsPatrick Toomey2019-05-311-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Based on the way parameters are currently processed, a parameter value of type Hash is recursively processed. For a value of type Array however, the current behavior is to simply return the original array, with no filtering. It is not clear what the expected behavior should be. But, doing nothing seems incorrect, since it bypasses custom Proc based parameter filtering all together for arrays of values. This change introduces a failing test in preparation to add logic that proposes one possible option for the expected behavior with Array values.
* | | | | | | | | | | Merge pull request #36738 from Edouard-chin/ec-errors-to_hash-stringRafael França2019-07-232-4/+9
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Modify behaviour of `AM::Errors#to_h`:
| * | | | | | | | | | | Modify behaviour of `AM::Errors#to_h`:Edouard CHIN2019-07-232-4/+9
| | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - `AM::Error#to_h` was kind of broken before and would return in the hash values a single error message. ```ruby person = Person.new person.errors.add(:name, "cannot be blank") person.errors.add(:name, "too long") puts person.errors.to_h # {name: 'too long'} ``` Since an attribute can have different errors, the previous behavior didn't make much sense. Now, `ActiveModel::Errors#to_hash` correctly returns an array of error messages containing all the errors for an attribute. However, one can easily be surprised by this change, so let's deprecated it first.
* | | | | | | | | | | Merge pull request #36665 from jmschneider/masterRafael Mendonça França2019-07-233-2/+10
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make currency symbols optional for money column type in PostgreSQL
| * | | | | | | | | | | Make currency symbols optional for money column type in PostgreSQLJoel Schneider2019-07-123-2/+10
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #36542 from spk/add-pidfile-option-to-puma-confRafael França2019-07-231-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Add pidfile option to puma config template
| * | | | | | | | | | | | Add pidfile option to puma config templateLaurent Arnoud2019-06-231-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allow to call `pumactl` directly without extra parameters needed
* | | | | | | | | | | | | Merge pull request #36642 from wagenet/fix-disk-service-hostRafael França2019-07-232-3/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | | Fix host for ActiveStorage DiskService
| * | | | | | | | | | | | Fix host for ActiveStorage DiskServicePeter Wagenet2019-07-092-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previous behavior would only set host, which didn't work correctly if the default_url_options contained the protocol or the port.
* | | | | | | | | | | | | Merge pull request #36733 from ch3rub1m/fix-cache-timestamp-format-guideRafael França2019-07-231-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix cache_timestamp_format default value in guides
| * | | | | | | | | | | | | Fix cache_timestamp_format default value in guidesch3rub1m2019-07-231-1/+1
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #36724 from Edouard-chin/ec-to-h-errorsRafael França2019-07-232-0/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Deprecate `AM::Errors#to_h`:
| * | | | | | | | | | | | | | Deprecated `AM::Errors#to_h`:Edouard CHIN2019-07-232-0/+16
| |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - In ef4d3215b1198c456780b8d18aa62be7795b9b8c I made a change to pass `AM::Error` object in case the arity of the block passed to `each` accepted less than 2 arguments. This is causing one issue for `to_h` as it expects the argument passed to the block to be an Array (and were are passing it an instance of `AM::Error`). There is no real reason to use `to_h` anymore since `to_hash` exists Deprecating `to_h` inf favor of `to_hash` Co-Authored-By: Rafael França <rafael@franca.dev>
* | | | | | | | | | | | | | Improve changelog entry, remove extraneous word [ci skip]Carlos Antonio da Silva2019-07-231-2/+2
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #36666 from gmcgibbon/allow_disabling_active_storage_routesGannon McGibbon2019-07-226-1/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make Active Storage routes optional
| * | | | | | | | | | | | | | Make Active Storage routes optionalGannon McGibbon2019-07-226-1/+24
|/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add configuration option to turn off drawing of Active Storage routes.
* | | | | | | | | | | | | | Remove changelog entry for backported changeGeorge Claghorn2019-07-221-7/+0
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #36726 from ↵Rafael França2019-07-221-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Edouard-chin/ec-source-annotation-extractor-deprecation Move the deprecation call after the new class has been defined: