aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Explicitly require `sidekiq/cli`yuuji.yaginuma2017-12-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | Currently, sidekiq integration test + Ruby 2.5.0-rc1 show exception as follows. ``` #<Thread:0x000000000670bec0@/home/travis/build/rails/rails/vendor/bundle/ruby/2.5.0/gems/sidekiq-5.0.5/lib/sidekiq/util.rb:23 run> terminated with exception (report_on_exception is true): /home/travis/build/rails/rails/vendor/bundle/ruby/2.5.0/gems/bootsnap-1.1.7/lib/bootsnap/load_path_cache/core_ext/active_support.rb:53:in `block in load_missing_constant': uninitialized constant Sidekiq::CLI (NameError) from /home/travis/build/rails/rails/vendor/bundle/ruby/2.5.0/gems/bootsnap-1.1.7/lib/bootsnap/load_path_cache/core_ext/active_support.rb:8:in `without_bootsnap_cache' from /home/travis/build/rails/rails/vendor/bundle/ruby/2.5.0/gems/bootsnap-1.1.7/lib/bootsnap/load_path_cache/core_ext/active_support.rb:53:in `rescue in load_missing_constant' from /home/travis/build/rails/rails/vendor/bundle/ruby/2.5.0/gems/bootsnap-1.1.7/lib/bootsnap/load_path_cache/core_ext/active_support.rb:42:in `load_missing_constant' from /home/travis/build/rails/rails/vendor/bundle/ruby/2.5.0/gems/sidekiq-5.0.5/lib/sidekiq/launcher.rb:65:in `heartbeat' from /home/travis/build/rails/rails/vendor/bundle/ruby/2.5.0/gems/sidekiq-5.0.5/lib/sidekiq/launcher.rb:123:in `start_heartbeat' ``` https://travis-ci.org/rails/rails/jobs/317187279#L2152 The reason for this is that `Sidekiq::CLI` has not been loaded. Sidekiq integration test launches a Sidekiq instance within another Ruby process. In such a case, need to require 'sidekiq/cli' in that launch code. Ref: https://github.com/mperham/sidekiq/pull/3692#issuecomment-352032251
* Handle invalid signed blob IDs gracefullyGeorge Claghorn2017-12-157-18/+51
|
* Merge pull request #31481 from claudiob/fix-ast-guidesClaudio B2017-12-151-6/+6
|\ | | | | [ci skip] Use :amazon, not :s3, so that guides reflect the current code
| * [ci skip] Use :amazon, not :s3, to reflect codeClaudio B2017-12-151-6/+6
|/ | | | | | | | The [template](https://github.com/rails/rails/blob/master/railties/lib/rails/generators/rails/app/templates/config/storage.yml.tt#L10) that generates the `config/storage.yml` file has the Amazon S3 key specified as `:amazon`, not `:s3`. The guides should reflect the nomenclature, given that every other service also has the name of the company as the key (:google, :microsoft).
* Merge pull request #31473 from shioyama/fix_instantiate_test_attributesRyuta Kamizono2017-12-161-4/+7
|\ | | | | Modify test to correctly pass attributes hash
| * Modify test to correctly pass attributes hashChris Salzberg2017-12-151-4/+7
| |
* | Restrict variants to variable image blobsGeorge Claghorn2017-12-154-4/+27
| |
* | Remove needless `change_table`Ryuta Kamizono2017-12-151-6/+2
| | | | | | | | | | These are using `remove_column` directly, not used `t` in `change_table`.
* | Sync header title with file name [ci skip]Ryuta Kamizono2017-12-152-3/+3
| | | | | | | | Like other Basics and Overview guides.
* | Merge pull request #31470 from ydakuka/fix-typos-a-st-guideRyuta Kamizono2017-12-151-5/+5
|\ \ | | | | | | Fix in ASt guide [ci skip]
| * | Fix in ASt guide [ci skip]Yauheni Dakuka2017-12-151-5/+5
| | |
* | | Merge pull request #31471 from yhirano55/inherit_active_record_baseRyuta Kamizono2017-12-151-2/+2
|\ \ \ | |/ / |/| | [ci skip] Inherit ActiveRecord::Base in example codes
| * | [ci skip] Inherit ActiveRecord::Base in example codesYoshiyuki Hirano2017-12-151-2/+2
| | |
* | | Fix guide generation error [ci skip]yuuji.yaginuma2017-12-151-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, generation of guide is an error in `5_2_release_notes.html`. ``` $ bunele exec rake guides:generate:html Generating 5_2_release_notes.md as 5_2_release_notes.html rails/guides/rails_guides/markdown.rb:44:in `dom_id': undefined method `[]' for nil:NilClass (NoMethodError) from rails/guides/rails_guides/markdown.rb:106:in `block (2 levels) in generate_structure' ``` It seems that it is an error because there are multiple `active-storage` anchors. Since Active Storage is a Major feature, it is unnecessary to show CHANGELOGs, so remove from `Incompatibilities` section.
* | | [ci skip] Add missing **DO NOT READ THIS FILE ON GITHUB, GUIDES ARE ↵Ryuta Kamizono2017-12-152-1/+2
| | | | | | | | | | | | PUBLISHED ON http://guides.rubyonrails.org.**
* | | Merge pull request #31466 from dixitp012/action_pack_doc_link_updateRyuta Kamizono2017-12-151-1/+1
|\ \ \ | |/ / |/| | [ci skip] update link
| * | [ci skip] update linkDixit Patel2017-12-151-1/+1
| | |
* | | Merge pull request #31464 from yhirano55/update_guide_indexGeorge Claghorn2017-12-141-0/+4
|\ \ \ | |/ / |/| | [ci skip] Update guide index for active storage
| * | [ci skip] Update guide index for active storageYoshiyuki Hirano2017-12-151-0/+4
|/ /
* | Clear dirty `schema_cache` after `dump_schema_cache`Ryuta Kamizono2017-12-151-0/+1
| | | | | | | | | | | | | | `dump_schema_cache` fills `schema_cache` even if the test that modifies the schema has properly cleared the schema cache. Fixes #31463.
* | Merge pull request #31037 from jeffreyguenther/activestorage-guideGeorge Claghorn2017-12-142-1/+550
|\ \ | | | | | | ActiveStorage Guide
| * | Tweak whitespaceJeffrey Guenther2017-12-141-0/+1
| | |
| * | Formatting updatesJeffrey Guenther2017-12-141-14/+19
| | |
| * | Merge branch 'master' into activestorage-guideJeffrey Guenther2017-12-14164-504/+1138
| |\ \ | |/ / |/| |
* | | Generate tmpname on its ownyuuji.yaginuma2017-12-151-1/+6
| | | | | | | | | | | | | | | | | | | | | `make_tmpname` was removed by https://github.com/ruby/ruby/commit/25d56ea7b7b52dc81af30c92a9a0e2d2dab6ff27. In this case, we want a file name, not a `File`. So cannot use `Tempfile`. Fixes #31458
* | | Merge pull request #31460 from ↵Ryuta Kamizono2017-12-1511-24/+24
|\ \ \ | | | | | | | | | | | | | | | | yahonda/deprecated_bigdecimal_new_ap_av_aj_as_guides Suppress `warning: BigDecimal.new is deprecated`
| * | | Suppress `warning: BigDecimal.new is deprecated`Yasuo Honda2017-12-1511-24/+24
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `BigDecimal.new` has been deprecated in BigDecimal 1.3.3 which will be a default for Ruby 2.5. Refer https://github.com/ruby/bigdecimal/commit/533737338db915b00dc7168c3602e4b462b23503 * This commit has been made as follows: ``` cd rails git grep -l BigDecimal.new | grep -v guides/source/5_0_release_notes.md | grep -v activesupport/test/xml_mini_test.rb | xargs sed -i -e "s/BigDecimal.new/BigDecimal/g" ``` - `activesupport/test/xml_mini_test.rb` Editmanually to remove `.new` and `::` - guides/source/5_0_release_notes.md This is a Rails 5.0 release notes.
* | | RedisCacheStore - Fix Default Error HandlerJesse Doyle2017-12-141-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | * The `DEFAULT_ERROR_HANDLER` constant in `ActiveSupport::Cache::RedisCacheStore` contained references to an undefined argument `e`, which is supposed to refer to the `exception` parameter. * Update the default error handler proc to correctly reference the `exception` parameter.
* | | Merge pull request #31434 from olivierlacan/boot-feedbackSean Griffin2017-12-142-0/+8
|\ \ \ | | | | | | | | Provide instant feedback when booting Rails
| * | | Provide instant feedback when booting RailsOlivier Lacan2017-12-132-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I've noticed during pair/mob programming sessions with peers that despite the speed boosts provided by Bootsnap and Spring, there is a noticeable latency between firing a bin/rails server command and any feedback being provided to the console. Depending on the size of the application this lack of feedback can make it seem like something is wrong when Rails is simply busy initializing. This change may seem gratuitous but by just printing one line to STDOUT we're giving a clear signal to the Rails user that their command has been received and that Rails is indeed booting. It almost imperciptibly makes Rails feel more responsive. Sure the code doesn't look very fancy but there's no other appropriate place I could think of putting it than boot.rb. Compare these two GIFs of booting without and with this change: Before: ![Without Boot Feedback](https://user-images.githubusercontent.com/65950/33964140-721041fc-e025-11e7-9b25-9d839ce92977.gif) After: ![With Boot Feedback](https://user-images.githubusercontent.com/65950/33964151-79e12f86-e025-11e7-93e9-7a75c70d408f.gif)
* | | | Merge pull request #31452 from yahonda/deprecated_bigdecimal_new_activemodelSean Griffin2017-12-143-23/+23
|\ \ \ \ | | | | | | | | | | Suppress `warning: BigDecimal.new is deprecated` in Active Model
| * | | | Suppress `warning: BigDecimal.new is deprecated` in Active ModelYasuo Honda2017-12-143-23/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `BigDecimal.new` has been deprecated in BigDecimal 1.3.3 which will be a default for Ruby 2.5. Refer ruby/bigdecimal@5337373 * This commit has been made as follows: ```ruby $ cd activemodel/ $ git grep -l BigDecimal.new | grep \.rb | xargs sed -i -e "s/BigDecimal.new/BigDecimal/g" ``` * This commit has been tested with these Ruby versions: ``` ruby 2.5.0dev (2017-12-15 trunk 61262) [x86_64-linux] ruby 2.4.2p198 (2017-09-14 revision 59899) [x86_64-linux] ruby 2.3.5p376 (2017-09-14 revision 59905) [x86_64-linux] ruby 2.2.8p477 (2017-09-14 revision 59906) [x86_64-linux] ```
* | | | | Merge pull request #31451 from yahonda/hash_digest_class_not_initializedRyuta Kamizono2017-12-151-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Address `warning: instance variable @hash_digest_class not initialized`
| * | | | | Address `warning: instance variable @hash_digest_class not initialized`Yasuo Honda2017-12-141-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ```ruby /path/to/rails/activesupport/lib/active_support/digest.rb:7: warning: instance variable @hash_digest_class not initialized ``
* | | | | Merge pull request #31453 from yahonda/report_on_exception_true_in_ruby25_mysql2Ryuta Kamizono2017-12-151-0/+2
|\ \ \ \ \ | | | | | | | | | | | | Suppress expected exceptions by `report_on_exception` = `false` in mysql2 test
| * | | | | Suppress expected exceptions by `report_on_exception` = `false`Yasuo Honda2017-12-141-0/+2
| |/ / / / | | | | | | | | | | | | | | | Follow up #31428 to address similar exceptions with mysql2 adapter
* / / / / Update nokogiri version on GemfileGuillermo Iguaran2017-12-142-10/+13
|/ / / /
* | | | Merge pull request #31289 from witlessbird/fips-compatibilityEileen M. Uchitelle2017-12-1413-12/+81
|\ \ \ \ | | | | | | | | | | Initial support for running Rails on FIPS-certified systems
| * | | | Introduced `ActiveSupport::Digest` that allows to specify hash function ↵Dmitri Dolguikh2017-12-1213-12/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | implementation and defaults to `Digest::MD5`. Replaced calls to `::Digest::MD5.hexdigest` with calls to `ActiveSupport::Digest.hexdigest`.
* | | | | Merge pull request #26815 from olivierlacan/log-query-sourceEileen M. Uchitelle2017-12-148-7/+97
|\ \ \ \ \ | | | | | | | | | | | | Log the original call site for an ActiveRecord query
| * | | | | Log call site for all queriesOlivier Lacan2017-12-138-7/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This new ActiveRecord configuration option allows you to easily pinpoint what line of application code is triggering SQL queries in the development log by appending below each SQL statement log the line of Ruby code that triggered it. It’s useful with N+1 issues, and to locate stray queries. By default this new option ignores Rails and Ruby code in order to surface only callers from your application Ruby code or your gems. It is enabled on newly generated Rails 5.2 applications and can be enabled on existing Rails applications: ```ruby Rails.application.configure do # ... config.active_record.verbose_query_logs = true end ``` The `rails app:upgrade` task will also add it to `config/development.rb`. This feature purposely avoids coupling with ActiveSupport::BacktraceCleaner since ActiveRecord can be used without ActiveRecord. This decision can be reverted in the future to allow more configurable backtraces (the exclusion of gem callers for example).
* | | | | | Enable `Layout/LeadingCommentSpace` to not allow cosmetic changes in the futureRyuta Kamizono2017-12-1432-88/+83
|/ / / / / | | | | | | | | | | | | | | | Follow up of #31432.
* | | | | Use released `resque-scheduler` instead of master versionyuuji.yaginuma2017-12-142-12/+7
| | | | | | | | | | | | | | | | | | | | | | | | | The v4.3.1 has already released that includes Redis 4.0 support. https://github.com/resque/resque-scheduler/blob/master/CHANGELOG.md#431---2017-11-20
* | | | | Merge pull request #31433 from ↵Rafael França2017-12-132-0/+29
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | jordan-brough/preserve-deprecated-method-visibility Preserve original method visibility when deprecating a method
| * | | | | Preserve original method visibility when deprecating a methodJordan Brough2017-12-132-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit fixes `deprecate` so that it preserves method visibility (like it did previously when it was utilizing `alias_method_chain`). When Module#prepend replaced alias_method_chain in a982a42 it caused deprecated methods to always become public. `alias_method_chain` had this bit of code: https://github.com/rails/rails/blob/v5.0.6/activesupport/lib/active_support/core_ext/module/aliasing.rb#L40-L47 which preserved method visibility. Without this fix, a workaround would be: ```ruby class C8 private def new_method end def old_method end deprecate :old_method, :new_method # workaround: instance_method(:old_method).owner.send(:private, :old_method) end ``` Because the visibility needs to be fixed on the Module prepended by MethodWrapper.
* | | | | | Merge pull request #31435 from yahonda/deprecated_bigdecimal_newRafael França2017-12-1313-24/+24
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Suppress `warning: BigDecimal.new is deprecated` in activerecord
| * | | | | Suppress `warning: BigDecimal.new is deprecated` in activerecordYasuo Honda2017-12-1313-24/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `BigDecimal.new` has been deprecated in BigDecimal 1.3.3 which will be a default for Ruby 2.5. Refer https://github.com/ruby/bigdecimal/commit/533737338db915b00dc7168c3602e4b462b23503 ``` $ cd rails/activerecord/ $ git grep -l BigDecimal.new | grep \.rb | xargs sed -i -e "s/BigDecimal.new/BigDecimal/g" ``` - Changes made only to Active Record. Will apply the same change to other module once this commit is merged. - The following deprecation has not been addressed because it has been reported at `ActiveRecord::Result.new`. `ActiveRecord::Result.ancestors` did not show `BigDecimal`. * Not addressed ```ruby /path/to/rails/activerecord/lib/active_record/connection_adapters/mysql/database_statements.rb:34: warning: BigDecimal.new is deprecated ``` * database_statements.rb:34 ```ruby ActiveRecord::Result.new(result.fields, result.to_a) if result ``` * ActiveRecord::Result.ancestors ```ruby [ActiveRecord::Result, Enumerable, ActiveSupport::ToJsonWithActiveSupportEncoder, Object, Metaclass::ObjectMethods, Mocha::ObjectMethods, PP::ObjectMixin, ActiveSupport::Dependencies::Loadable, ActiveSupport::Tryable, JSON::Ext::Generator::GeneratorMethods::Object, Kernel, BasicObject] ``` This commit has been tested with these Ruby and BigDecimal versions - ruby 2.5 and bigdecimal 1.3.3 ``` $ ruby -v ruby 2.5.0dev (2017-12-14 trunk 61217) [x86_64-linux] $ gem list |grep bigdecimal bigdecimal (default: 1.3.3, default: 1.3.2) ``` - ruby 2.4 and bigdecimal 1.3.0 ``` $ ruby -v ruby 2.4.2p198 (2017-09-14 revision 59899) [x86_64-linux-gnu] $ gem list |grep bigdecimal bigdecimal (default: 1.3.0) ``` - ruby 2.3 and bigdecimal 1.2.8 ``` $ ruby -v ruby 2.3.5p376 (2017-09-14 revision 59905) [x86_64-linux] $ gem list |grep -i bigdecimal bigdecimal (1.2.8) ``` - ruby 2.2 and bigdecimal 1.2.6 ``` $ ruby -v ruby 2.2.8p477 (2017-09-14 revision 59906) [x86_64-linux] $ gem list |grep bigdecimal bigdecimal (1.2.6) ```
* | | | | | Merge pull request #31432 from yhirano55/add_a_space_to_comment_in_active_jobRafael França2017-12-131-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | [ci skip] Add a space to comment in SidekiqAdapter
| * | | | | [ci skip] Add a space to comment in SidekiqAdapterYoshiyuki Hirano2017-12-141-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | * I think it's better to have a leading space after the `#` denoting the start of the comment.
* | | | | Merge pull request #31429 from meinac/expose_activestorage_routesGeorge Claghorn2017-12-132-19/+38
|\ \ \ \ \ | |/ / / / |/| | | | Expose Active Storage routes