railties 6.0.1 → 6.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8978d3b263c42b7a7f85938aa1440c25f6796c9be7616280cf2c97930e088a70
-  data.tar.gz: 4f29426a081d75ad0716dfd4780280f62def9d25dcffa7b614b6c64e764cb9ad
+  metadata.gz: e6d6daf9b3f1b547bf223fe3590049db5c3892515b09e449db25763393cbdf26
+  data.tar.gz: 331197625259cb0dc0f88b6c5908e764cb18aadb9da086a63495772d1c09befa
 SHA512:
-  metadata.gz: 4da34a4d6f2bb8c0d3b0d0580a785a6b31fa591c3875b47dd9f8ceeb30a7c7f19a0ec282f511be8f2f9cbf0132ddd29e4b21f8562beeeec3519935d143ef9f0f
-  data.tar.gz: e96e83bf20181c578bc056b63a47397ea1db2d3075cbb9c1a88b79b4b19ce5e076dbc15a05fe9ec9e35b8f3724f075ce4cdb64df8ba7c037dd8524b5916bf938
+  metadata.gz: 3116c14dccf11d82ae0ab6c4ef82b62eb0ab0b141139527c9a0026429605730a5221f500229b34c1cc0eced8b42aa65689ab9449aaa415327014748ec64a188e
+  data.tar.gz: 76d90b6785dead03c3311820e61cb21c6918cf5c02df7e5b80d1613c2a2cefbe97a441f9974a9ee2645c74a43b7a96ef3890f0d5584bdaf24f01e34a7cc9650e

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## Rails 6.0.2 (December 13, 2019) ##
+
+*   Fix the collision check for the scaffold generator.
+
+    *Ryan Robeson*
+
 ## Rails 6.0.1 (November 5, 2019) ##
 
 *   The `zeitwerk:check` Rake task reports files outside the app's root

data/RDOC_MAIN.rdoc

@@ -80,7 +80,6 @@ and may also be used independently outside \Rails.
    * {Getting Started with \Rails}[https://guides.rubyonrails.org/getting_started.html].
    * {Ruby on \Rails Guides}[https://guides.rubyonrails.org].
    * {The API Documentation}[https://api.rubyonrails.org].
-   * {Ruby on \Rails Tutorial}[https://www.railstutorial.org/book].
 
 == Contributing
 

data/lib/rails/application/configuration.rb

@@ -71,6 +71,7 @@ module Rails
         @add_autoload_paths_to_load_path         = true
       end
 
+      # Loads default configurations. See {the result of the method for each version}[https://guides.rubyonrails.org/configuring.html#results-of-config-load-defaults].
       def load_defaults(target_version)
         case target_version.to_s
         when "5.0"

data/lib/rails/command/base.rb

@@ -17,6 +17,10 @@ module Rails
       include Actions
 
       class << self
+        def exit_on_failure? # :nodoc:
+          false
+        end
+
         # Returns true when the app is a Rails engine.
         def engine?
           defined?(ENGINE_ROOT)

data/lib/rails/gem_version.rb

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

data/lib/rails/generators/base.rb

@@ -24,6 +24,10 @@ module Rails
       add_runtime_options!
       strict_args_position!
 
+      def self.exit_on_failure? # :nodoc:
+        false
+      end
+
       # Returns the source root for this generator using default_source_root as default.
       def self.source_root(path = nil)
         @_source_root = path if path

data/lib/rails/generators/named_base.rb

@@ -213,7 +213,7 @@ module Rails
         #
         def self.check_class_collision(options = {}) # :doc:
           define_method :check_class_collision do
-            name = if respond_to?(:controller_class_name) # for ResourceHelpers
+            name = if respond_to?(:controller_class_name, true) # for ResourceHelpers
               controller_class_name
             else
               class_name

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: railties
 version: !ruby/object:Gem::Version
-  version: 6.0.1
+  version: 6.0.2
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-05 00:00:00.000000000 Z
+date: 2019-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.1
+        version: 6.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.1
+        version: 6.0.2
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.1
+        version: 6.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.1
+        version: 6.0.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -92,14 +92,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.1
+        version: 6.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.1
+        version: 6.0.2
 description: 'Rails internals: application bootup, plugins, generators, and rake tasks.'
 email: david@loudthinking.com
 executables:
@@ -432,10 +432,10 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails/rails/issues
-  changelog_uri: https://github.com/rails/rails/blob/v6.0.1/railties/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v6.0.1/
+  changelog_uri: https://github.com/rails/rails/blob/v6.0.2/railties/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v6.0.2/
   mailing_list_uri: https://groups.google.com/forum/#!forum/rubyonrails-talk
-  source_code_uri: https://github.com/rails/rails/tree/v6.0.1/railties
+  source_code_uri: https://github.com/rails/rails/tree/v6.0.2/railties
 post_install_message: 
 rdoc_options:
 - "--exclude"