railties 6.1.0.rc2 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac1f674c7449e11079fc024e3ad0615358ac700713d2e274c3fd2fb1ccb891d8
-  data.tar.gz: 1d8841ea97183fa77784e1a7ef3ffdec7796fa281de6878f4aa3995d3e86078c
+  metadata.gz: 1adfe379d94049a35a1306f22a5d1368e3b88455d57bb1e4764b845f7ec7e0c5
+  data.tar.gz: 1ff026a5d1cc46e2cb543b15568fb2f12915d468a3c3723efd2daa18d70fc04a
 SHA512:
-  metadata.gz: af92feb6af3f6b35e4974f91dd1b869736a45ab74c8b6217ee8b43bd62443efe22769b800b5adcc7810b18fb82a17a98ec888010fb984ef557989d3249ae81a7
-  data.tar.gz: 3bc9759bea256a05a1a8d4160ded6fcaaf2657f880634de13863c6448f20d7d9bcdbb4970e9c0424b17add8823c91c216daaf2377a7b4f77c9078a25d2d51852
+  metadata.gz: 1b297610d901f515027eb7bb31b3bf912437ccc0643276ba5b166216fe41f8f6e74b42783002d8bd1a904fa512b18ffbcb258375d019299918a21c5b6c220cf6
+  data.tar.gz: 9b1c0e55db347c811b93edb2e68dee00b99cd476e917de5e138c09faa4eaaaa1df3a374bc54b09934895c22993080e327d530129ba4163f209cd42d438deaabe

data/CHANGELOG.md

@@ -1,9 +1,4 @@
-## Rails 6.1.0.rc2 (December 01, 2020) ##
-
-*   No changes.
-
-
-## Rails 6.1.0.rc1 (November 02, 2020) ##
+## Rails 6.1.0 (December 09, 2020) ##
 
 *   Added `Railtie#server` hook called when Rails starts a server.
     This is useful in case your application or a library needs to run

data/lib/rails/application/configuration.rb

@@ -185,6 +185,20 @@ module Rails
             action_view.form_with_generates_remote_forms = false
           end
 
+          if respond_to?(:active_storage)
+            active_storage.queues.analysis = nil
+            active_storage.queues.purge = nil
+          end
+
+          if respond_to?(:action_mailbox)
+            action_mailbox.queues.incineration = nil
+            action_mailbox.queues.routing = nil
+          end
+
+          if respond_to?(:action_mailer)
+            action_mailer.deliver_later_queue_name = nil
+          end
+
           ActiveSupport.utc_to_local_returns_utc_offset_times = true
         else
           raise "Unknown version #{target_version.to_s.inspect}"

data/lib/rails/engine.rb

@@ -2,6 +2,7 @@
 
 require "rails/railtie"
 require "rails/engine/railties"
+require "active_support/callbacks"
 require "active_support/core_ext/module/delegation"
 require "active_support/core_ext/object/try"
 require "pathname"
@@ -422,6 +423,9 @@ module Rails
       end
     end
 
+    include ActiveSupport::Callbacks
+    define_callbacks :load_seed
+
     delegate :middleware, :root, :paths, to: :config
     delegate :engine_name, :isolated?, to: :class
 
@@ -559,13 +563,7 @@ module Rails
     # Blog::Engine.load_seed
     def load_seed
       seed_file = paths["db/seeds.rb"].existent.first
-      return unless seed_file
-
-      if config.try(:active_job)&.queue_adapter == :async
-        with_inline_jobs { load(seed_file) }
-      else
-        load(seed_file)
-      end
+      run_callbacks(:load_seed) { load(seed_file) } if seed_file
     end
 
     initializer :load_environment_config, before: :load_environment_hook, group: :all do
@@ -637,6 +635,12 @@ module Rails
       end
     end
 
+    initializer :wrap_executor_around_load_seed do |app|
+      self.class.set_callback(:load_seed, :around) do |engine, seeds_block|
+        app.executor.wrap(&seeds_block)
+      end
+    end
+
     initializer :engines_blank_point do
       # We need this initializer so all extra initializers added in engines are
       # consistently executed after all the initializers above across all engines.
@@ -678,18 +682,6 @@ module Rails
         end
       end
 
-      def with_inline_jobs
-        queue_adapter = config.active_job.queue_adapter
-        ActiveSupport.on_load(:active_job) do
-          self.queue_adapter = :inline
-        end
-        yield
-      ensure
-        ActiveSupport.on_load(:active_job) do
-          self.queue_adapter = queue_adapter
-        end
-      end
-
       def has_migrations?
         paths["db/migrate"].existent.any?
       end

data/lib/rails/gem_version.rb

@@ -10,7 +10,7 @@ module Rails
     MAJOR = 6
     MINOR = 1
     TINY  = 0
-    PRE   = "rc2"
+    PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/rails/generators/rails/app/templates/bin/rails.tt

@@ -1,3 +1,6 @@
+<% if spring_install? -%>
+load File.expand_path("spring", __dir__)
+<% end -%>
 APP_PATH = File.expand_path('../config/application', __dir__)
 require_relative "../config/boot"
 require "rails/commands"

data/lib/rails/generators/rails/app/templates/bin/rake.tt

@@ -1,3 +1,6 @@
+<% if spring_install? -%>
+load File.expand_path("spring", __dir__)
+<% end -%>
 require_relative "../config/boot"
 require "rake"
 Rake.application.run

data/lib/rails/generators/rails/app/templates/bin/spring.tt

@@ -1,7 +1,9 @@
-# Load Spring without loading other gems in the Gemfile, for speed.
-require "bundler"
-Bundler.locked_gems.specs.find { |spec| spec.name == "spring" }&.tap do |spring|
-  Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path
-  gem "spring", spring.version
-  require "spring/binstub"
+if !defined?(Spring) && [nil, "development", "test"].include?(ENV["RAILS_ENV"])
+  # Load Spring without loading other gems in the Gemfile, for speed.
+  require "bundler"
+  Bundler.locked_gems.specs.find { |spec| spec.name == "spring" }&.tap do |spring|
+    Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path
+    gem "spring", spring.version
+    require "spring/binstub"
+  end
 end

data/lib/rails/generators/rails/app/templates/bin/yarn.tt

@@ -8,9 +8,11 @@ Dir.chdir(APP_ROOT) do
     normalized_path != __dir__ && File.executable?(Pathname.new(normalized_path).join('yarn'))
   end
 
-  exec File.expand_path(Pathname.new(executable_path).join('yarn')), *ARGV
-rescue Errno::ENOENT
-  $stderr.puts "Yarn executable was not detected in the system."
-  $stderr.puts "Download Yarn at https://yarnpkg.com/en/docs/install"
-  exit 1
+  if executable_path
+    exec File.expand_path(Pathname.new(executable_path).join('yarn')), *ARGV
+  else
+    $stderr.puts "Yarn executable was not detected in the system."
+    $stderr.puts "Download Yarn at https://yarnpkg.com/en/docs/install"
+    exit 1
+  end
 end

data/lib/rails/generators/rails/app/templates/config/boot.rb.tt

@@ -1,10 +1,4 @@
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
-<% if spring_install? -%>
-
-if !defined?(Spring) && [nil, "development", "test"].include?(ENV["RAILS_ENV"])
-  load File.expand_path("../bin/spring", __dir__)
-end
-<% end -%>
 
 require "bundler/setup" # Set up gems listed in the Gemfile.
 <% if depend_on_bootsnap? -%>

data/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults_6_1.rb.tt

@@ -46,3 +46,18 @@
 
 # Make `form_with` generate non-remote forms by default.
 # Rails.application.config.action_view.form_with_generates_remote_forms = false
+
+# Set the default queue name for the analysis job to the queue adapter default.
+# Rails.application.config.active_storage.queues.analysis = nil
+
+# Set the default queue name for the purge job to the queue adapter default.
+# Rails.application.config.active_storage.queues.purge = nil
+
+# Set the default queue name for the incineration job to the queue adapter default.
+# Rails.application.config.action_mailbox.queues.incineration = nil
+
+# Set the default queue name for the routing job to the queue adapter default.
+# Rails.application.config.action_mailbox.queues.routing = nil
+
+# Set the default queue name for the mail deliver job to the queue adapter default.
+# Rails.application.config.action_mailer.deliver_later_queue_name = nil

data/lib/rails/railtie.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "rails/initializable"
+require "active_support/descendants_tracker"
 require "active_support/inflector"
 require "active_support/core_ext/module/introspection"
 require "active_support/core_ext/module/delegation"
@@ -135,6 +136,7 @@ module Rails
   class Railtie
     autoload :Configuration, "rails/railtie/configuration"
 
+    extend ActiveSupport::DescendantsTracker
     include Initializable
 
     ABSTRACT_RAILTIES = %w(Rails::Railtie Rails::Engine Rails::Application)
@@ -144,13 +146,7 @@ module Rails
       delegate :config, to: :instance
 
       def subclasses
-        @subclasses ||= []
-      end
-
-      def inherited(base)
-        unless base.abstract_railtie?
-          subclasses << base
-        end
+        super.reject(&:abstract_railtie?)
       end
 
       def rake_tasks(&blk)

data/lib/rails/tasks/yarn.rake

@@ -8,7 +8,15 @@ namespace :yarn do
     node_env = ENV.fetch("NODE_ENV") do
       valid_node_envs.include?(Rails.env) ? Rails.env : "production"
     end
-    system({ "NODE_ENV" => node_env }, "#{Rails.root}/bin/yarn install --no-progress --frozen-lockfile")
+
+    yarn_flags =
+      if `#{Rails.root}/bin/yarn --version`.start_with?("1")
+        "--no-progress --frozen-lockfile"
+      else
+        "--immutable"
+      end
+
+    system({ "NODE_ENV" => node_env }, "#{Rails.root}/bin/yarn install #{yarn_flags}")
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: railties
 version: !ruby/object:Gem::Version
-  version: 6.1.0.rc2
+  version: 6.1.0
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-12-01 00:00:00.000000000 Z
+date: 2020-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.0.rc2
+        version: 6.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.0.rc2
+        version: 6.1.0
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.0.rc2
+        version: 6.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.0.rc2
+        version: 6.1.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.0.rc2
+        version: 6.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.0.rc2
+        version: 6.1.0
 description: 'Rails internals: application bootup, plugins, generators, and rake tasks.'
 email: david@loudthinking.com
 executables:
@@ -426,10 +426,10 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails/rails/issues
-  changelog_uri: https://github.com/rails/rails/blob/v6.1.0.rc2/railties/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v6.1.0.rc2/
+  changelog_uri: https://github.com/rails/rails/blob/v6.1.0/railties/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v6.1.0/
   mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
-  source_code_uri: https://github.com/rails/rails/tree/v6.1.0.rc2/railties
+  source_code_uri: https://github.com/rails/rails/tree/v6.1.0/railties
 post_install_message: 
 rdoc_options:
 - "--exclude"
@@ -443,9 +443,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.1.4
 signing_key: