aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix cache_timestamp_format default value in guidesch3rub1m2019-07-231-1/+1
|
* 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
| | | | |
* | | | | Merge pull request #36712 from tekin/include-more-commands-in-rails-help-outputEileen M. Uchitelle2019-07-191-4/+4
|\ \ \ \ \ | |_|/ / / |/| | | | Include common commands in rails help output
| * | | | Include common commands in rails help outputTekin Suleyman2019-07-191-4/+4
|/ / / / | | | | | | | | | | | | | | | | | | | | With their descriptions commented out these commands were not included in the rails help command's output, which is a shame as they are useful, particularly during the development of more complex migrations.
* | | | Merge pull request #36710 from ypresto/patch-1Ryuta Kamizono2019-07-191-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | [ActionController] Fix send_file example for 404 [ci skip]
| * | | | [ActionController] Fix send_file example for 404Yuya Tanaka2019-07-191-1/+1
|/ / / /
* | | | Merge pull request #36703 from y-yagi/script-src-xxx_and_style-src-xxxy-yagi2019-07-192-0/+28
|\ \ \ \ | |/ / / |/| | | Add support for script-src-attr / elem and style-src-attr / elem directives
| * | | Add support for script-src-attr / elem and style-src-attr / elem directivesyuuji.yaginuma2019-07-182-0/+28
| | | | | | | | | | | | | | | | | | | | These directives can be used in Chrome 75. Ref: https://www.chromestatus.com/feature/5141352765456384
* | | | Merge pull request #36695 from kamipo/revert_unnecessary_changeRyuta Kamizono2019-07-181-1/+1
|\ \ \ \ | |/ / / |/| | | Revert "Merge pull request #36676 from wjessop/change_activestorage_metadata_duration_to_bound"
| * | | Revert "Merge pull request #36676 from ↵Ryuta Kamizono2019-07-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wjessop/change_activestorage_metadata_duration_to_bound" This reverts commit a307c697b28e3c8b2860d2274c23e4d95dc164ae, reversing changes made to f30f76af747858826d3618866676cd5a4979e64a. Reason: This assertion is not failed even without this PR since both ffprobe versions (3.2.14 and 4.1.3) return the same duration 5.166648 for `video.mp4`. So there is no need to touch this assertion at this point.
* | | | Merge pull request #36603 from y-yagi/add_skip_collision_check_optionYuji Yaginuma2019-07-182-2/+15
|\ \ \ \ | | | | | | | | | | Add `skip-collision-check` option to generator
| * | | | Add `skip-collision-check` option to generatoryuuji.yaginuma2019-07-052-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Until Rails 5.2, generators can run same name multi times without destroying. But Rails 6.0(with Zeitwerk) can't this. In Rails 6.0, an error occurs due to class name collision check. The check uses `const_defined?`, which assumes that the autoload object is also defined. https://ruby-doc.org/core-2.6.3/Module.html#method-i-const_defined-3F It did not work until Rails 5.2, but Zeitwerk seems to be able to correctly check this against the application's code. However, this is a little inconvenient if want to run the generator again like mistake an attribute name(need to run `destoy` before). In order to solve this, this PR adds an option to skip the collision check. With this option, you can overwrite files just as did until Rails 5.2.
* | | | | Merge pull request #36691 from Edouard-chin/ec-system-test-routeRafael França2019-07-172-6/+13
|\ \ \ \ \ | | | | | | | | | | | | Don't include routes helpers inside System test class:
| * | | | | Don't include routes helpers inside System test class:Edouard CHIN2019-07-162-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - https://github.com/rails/rails/pull/36283 made a change to make SystemTest inherits from ActiveSupport::TestCase instead of ActionDispatch::IntegrationTest. With this change, the route helpers are now directly included inside the SystemTest class. This causes an edge case in case you have a routes whos name starts with `test_`, minitest will consider it as a test and will try to run it https://github.com/seattlerb/minitest/blob/ab39d35fb4e84eb866ed9c4ecb707cbf3889de42/lib/minitest/test.rb#L66 This PR uses a proxy and deleted missing method to a dummy class that has all the route helpers.
* | | | | | Merge pull request #36700 from ↵Eileen M. Uchitelle2019-07-172-15/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | cpruitt/revert-36690-make-parameterize-requires-utf-8-explicit Revert "Make UTF-8 string requirement explicit for `ActiveSupport::Inflector.transliterate`"
| * | | | | | Revert "Make UTF-8 string requirement explicit for ↵Cliff Pruitt2019-07-172-15/+2
|/ / / / / / | | | | | | | | | | | | | | | | | | `ActiveSupport::Inflector.transliterate`"
* | | | | | Merge pull request #36690 from cpruitt/make-parameterize-requires-utf-8-explicitEileen M. Uchitelle2019-07-172-2/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | Make UTF-8 string requirement explicit for `ActiveSupport::Inflector.transliterate`
| * | | | | | Make UTF-8 string requirement explicit for `transliterate`Cliff Pruitt2019-07-162-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's noted in #34062 that String#parameterize will raise an `Encoding::CompatibilityError` if the string is not UTF-8 encoded. The error is raised as a result of passing the string to `.unicode_normalize`. This PR raises a higher level `ArgumentError` if the provided string is not UTF-8 and updates documentation to note the encoding requirement.
* | | | | | | Merge pull request #36696 from inopinatus/support_beginless_rangesRyuta Kamizono2019-07-173-2/+30
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Support beginless ranges in hash conditions.
| * | | | | | | Support beginless ranges in hash conditions.Josh Goodall2019-07-173-2/+30
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ruby 2.7 introduces beginless ranges (..value and ...value) and as with endless ranges we can turn these into inequalities, enabling expressions such as Order.where(created_at: ..1.year.ago) User.where(karma: ...0)
* | | | | | | Merge pull request #36635 from ↵Kasper Timm Hansen2019-07-171-1/+1
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | abhaynikam/36332-fix-engine-documentation-to-remove-js-directory-mention Fixed the engine documentation to not mention of assets/javascript in directory structure [ci skip]
| * | | | | | Fixed the engine documentation to not mention of assets/javascripts in app ↵Abhay Nikam2019-07-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | directory structure [ci skip]
* | | | | | | Merge pull request #36694 from kirs/timeout-error-superclassRafael França2019-07-163-5/+12
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [ActiveRecord] Superclass for aborted queries
| * | | | | | | [ActiveRecord] Superclass for aborted queriesKir Shatrov2019-07-163-5/+12
|/ / / / / / /
* | | | | | | Add missing period [ci skip]Rafael Mendonça França2019-07-161-1/+1
| | | | | | |
* | | | | | | Merge pull request #36692 from kirs/mysql2-adapter-timeoutRafael França2019-07-163-1/+23
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Raise specific exception on Mysql2::Error::TimeoutError
| * | | | | | | Raise specific exception on Mysql2::Error::TimeoutErrorKir Shatrov2019-07-163-1/+23
| | | | | | | |
* | | | | | | | Merge pull request #36648 from louim/patch-1Rafael França2019-07-161-2/+2
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | Update message verifier documentation [ci skip]
| * | | | | | | Update message verifier documentation [ci skip]Louis-Michel Couture2019-07-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Generate method of ActiveSupport Message verifier implied that the message is encrypted, but the message is simply Base64-encoded.
* | | | | | | | Merge pull request #36667 from ↵Gannon McGibbon2019-07-161-0/+3
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | gmcgibbon/clarify_logger_set_in_log_subscriber_docs Specify log subscribers need a logger set before they can receive events
| * | | | | | | Specify log subscribers need a logger set before they can receive eventsGannon McGibbon2019-07-151-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current example code for `ActiveSupport::LogSubscriber` mysteriously fails if you're using it outside of Rails. This helps clarify a logger needs to be set first before log subscribers can process events. [ci skip]
* | | | | | | | Merge pull request #36685 from Shopify/as-depedencies-unhook-fixRafael França2019-07-161-3/+23
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix Loadable.exclude_from to also reset Kernel#require
| * | | | | | | | Fix Loadable.exclude_from to also reset Kernel#requireJean Boussier2019-07-161-3/+23
| | | | | | | | |
* | | | | | | | | Merge pull request #36639 from Edouard-chin/ec-am-errors-fullmessagesRafael França2019-07-168-131/+173
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Move the `ActiveModel:Errors#full_message` method to the `Error` class:
| * | | | | | | | | Switch to use `class_attribute`:Edouard CHIN2019-07-162-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Since `ActiveModel::Error` can now be inherited by `ActiveModel::NestedError`, when the latter generates a `full_message`, the `i18n_customize_full_message` accessor set in the parent class is not set. This commit fixes that by using a `class_attribute` instead.
| * | | | | | | | | Move the `ActiveModel:Errors#full_message` method to the `Error` class:Edouard CHIN2019-07-168-131/+161
| | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - One regression introduced by the "AM errors as object" features is about the `full_messages` method. It's currently impossible to call that method if the `base` object passed in the constructor of `AM::Errors` doesn't respond to the `errors` method. That's because `full_messages` now makes a weird back and forth trip `AM::Errors#full_messages` -> `AM::Error#full_message` -> `AM::Errors#full_message` Since `full_message` (singular) isn't needed by AM::Errors, I moved it to the `AM::Error` (singular) class. This way we don't need to grab the `AM::Errors` object from the base.