aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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:
| * | | | | | Move the deprecation call after the new class has been defined:Edouard CHIN2019-07-221-5/+5
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - If we create the deprecation before the new class is defined this creates an issue in case you use a `TracePoint`. The `Tracepoint#return_value` will try to get the new class constant resulting in a uninitialized constant Rails::SourceAnnotationExtractor The problem can be reproduced like this: ```ruby @defined = Set.new ANONYMOUS_CLASS_DEFINITION_TRACEPOINT = TracePoint.new(:c_return) do |tp| next unless @defined.add?(tp.return_value) end ANONYMOUS_CLASS_DEFINITION_TRACEPOINT.enable require 'rails' require "rails/source_annotation_extractor" ```
* | | | | | Merge pull request #36623 from ↵George Claghorn2019-07-223-2/+44
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | alipman88/exclude_marshal_dump_from_delegate_missing_to Exclude marshal_dump & _dump methods from being delegated via delegate_missing_to extension, fix #36522
| * | | | | Omit marshal_dump & _dump from delegate_missing_toAaron Lipman2019-07-173-2/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Exclude missing marshal_dump and _dump methods from being delegated to an object's delegation target via the delegate_missing_to extension. This avoids unintentionally adding instance variables to an object during marshallization, should the delegation target be a method which would otherwise add them. In current versions of Ruby, a bug exists in the way objects are marshalled, allowing for instance variables to be added or removed during marshallization (see https://bugs.ruby-lang.org/issues/15968). This results in a corrupted serialized byte stream, causing an object's instance variables to "leak" into subsequent serialized objects during demarshallization. In Rails, this behavior may be triggered when marshalling an object that uses the delegate_missing_to extension, if the delegation target is a method which adds or removes instance variables to an object being marshalled - when calling Marshal.dump(object), Ruby's built in behavior will check whether the object responds to :marshal_dump or :_dump, which in turn triggers the delegation target method in the responds_to_missing? function defined in activesupport/lib/active_support/core_ext/module/delegation.rb While future versions of Ruby will resolve this bug by raising a RuntimeError, the underlying cause of this error may not be readily apparent when encountered by Rails developers. By excluding marshal_dump and _dump from being delegated to an object's target, this commit eliminates a potential cause of unexpected behavior and/or RuntimeErrors. Fixes #36522
* | | | | | Merge pull request #36723 from ↵Ryuta Kamizono2019-07-222-12/+51
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | masakazutakewaka/fix_create_newline_between_blocks FIX: create a newline before group, github and source
| * | | | | | create a newline between blocks when gem_group, github and add_source was ↵masakazutakewaka2019-07-212-12/+51
|/ / / / / / | | | | | | | | | | | | | | | | | | called.
* | | | | | Merge pull request #36721 from Edouard-chin/ec-errors-eachCarlos Antonio da Silva2019-07-212-1/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix deprecation on `AM::Errors` when each is called indirectly
| * | | | | | Fix deprecation on `AM::Errors` when each is called indirectly:Edouard CHIN2019-07-202-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - `AM::Errors#each` is implemented for the `Enumerator` module and get called indirectly by a bunch of method in the ruby land (map, first, select ...) These methods have a `-1` arity as they are written in C and they wrongly trigger a deprecation warning. This commit fixes that and correctectly return a `AM::Error` object when `each` is called with a negative arity.
* | | | | | | Merge pull request #35285 from ↵y-yagi2019-07-212-16/+63
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | masakazutakewaka/fix_railtie_add_newline_to_gemfile_insertion Add a newline at the end of a Gemfile when it doesn't end with a newline
| * | | | | | Append a newline to the Gemfile if it doesn't end with a newlinemasakazutakewaka2019-07-192-16/+63
| | | | | | |
* | | | | | | Preserve existing attachment assignment behavior for upgraded appsGeorge Claghorn2019-07-209-15/+117
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Assigning to a collection of attachments appends rather than replacing, as in 5.2. Existing 5.2 apps that rely on this behavior will no longer break when they're upgraded to 6.0. For apps generated on 6.0 or newer, assigning replaces the existing attachments in the collection. #attach should be used to add new attachments to the collection without removing existing ones. I expect that we'll deprecate the old behavior in 6.1. Closes #36374.
* | | | | | | Fix argument in doc sample of new `sms_to` helper [ci skip]Carlos Antonio da Silva2019-07-191-1/+1
| | | | | | |
* | | | | | | Merge pull request #36511 from aantix/sms_link_helperGuillermo Iguaran2019-07-192-0/+110
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Helper method to create an sms link
| * | | | | | | Doc changes.Jim Jones2019-06-181-4/+4
| | | | | | | |
| * | | | | | | Helper method to create an sms link - when clicked it opens the ↵Jim Jones2019-06-182-0/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | phone/desktop's messaging client with the phone number and optional body value prepopulated.
* | | | | | | | Merge pull request #36713 from Shopify/fix-type-in-templateKasper Timm Hansen2019-07-191-3/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix a minor typo in ActionView::UnboundTemplate
| * | | | | | | | Fix a minor typo in ActionView::UnboundTemplateJean Boussier2019-07-191-3/+3
| | | | | | | | |
* | | | | | | | | Merge pull request #36706 from kirs/dedup-optimizer-hintsRyuta Kamizono2019-07-192-1/+8
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | [ActiveRecord] Deduplicate optimizer hints
| * | | | | | | | | [ActiveRecord] Deduplicate optimizer hintsKir Shatrov2019-07-192-1/+8
| | | | | | | | | |