railties 6.1.1 → 6.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e4b20eb9abd2c8e71d7c802b1adc936d2e0e3fa7afed6c547c95389bb31952a
-  data.tar.gz: efbbfbb14c05be75a8eff3da93a93cb7a53e9aafd357a9af14bd262b50b5f7a8
+  metadata.gz: f95a5e8436f261b26ce4c66e79858252dd5537abbadd42b11c37041875479a50
+  data.tar.gz: 9cea22465cff4bacad402bb460e45f526ec3d90b3b5266677a118554d14f767d
 SHA512:
-  metadata.gz: beeedae94ff8b9e2f457a988901f9c917ef4f6d1003d98a1fc0fa01ac9f8c314d22d386b9fc2a4b2aae3d9bbcfa3f4621b844c10c4d2f3f28fe0775b30322a55
-  data.tar.gz: 37b5a5f78bc733c05f52e071bcbc83f50894bdaa26a2a5fa60f779512640fc2b5463f436ed8073c0f5effe4dfe3dc23a02cde10296b062c787b1e6ef004809a1
+  metadata.gz: 6c2dd30ae919200539977d3732587a07cc6746201cb649fce19b94e90e46295b97c10176548d9a31807ab96a049cb304d2fa2ba9949b8a4f4c0e39ba981c10a2
+  data.tar.gz: 1dbdd0412d69d4a58b0f76ebfd5dc4accb6f2c8a695dacb2f8d66b2bc92e032a247f8c622afbd4e39edbfd7406a06ff12dc1e91708d880a43e1f4a946e288196

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## Rails 6.1.2 (February 09, 2021) ##
+
+*   No changes.
+
+
 ## Rails 6.1.1 (January 07, 2021) ##
 
 *   Allow spaces in path to Yarn binstub and only run on precompile if needed.

data/README.rdoc

@@ -17,7 +17,7 @@ The latest version of Railties can be installed with RubyGems:
 
 Source code can be downloaded as part of the Rails project on GitHub
 
-* https://github.com/rails/rails/tree/master/railties
+* https://github.com/rails/rails/tree/main/railties
 
 == License
 

data/lib/rails/api/task.rb

@@ -189,7 +189,7 @@ module Rails
 
     class EdgeTask < RepoTask
       def rails_version
-        "master@#{`git rev-parse HEAD`[0, 7]}"
+        "main@#{`git rev-parse HEAD`[0, 7]}"
       end
     end
 

data/lib/rails/commands/notes/notes_command.rb

@@ -5,7 +5,7 @@ require "rails/source_annotation_extractor"
 module Rails
   module Command
     class NotesCommand < Base # :nodoc:
-      class_option :annotations, aliases: "-a", desc: "Filter by specific annotations, e.g. Foobar TODO", type: :array, default: Rails::SourceAnnotationExtractor::Annotation.tags
+      class_option :annotations, aliases: "-a", desc: "Filter by specific annotations, e.g. Foobar TODO", type: :array
 
       def perform(*)
         require_application_and_environment!
@@ -15,7 +15,7 @@ module Rails
 
       private
         def display_annotations
-          annotations = options[:annotations]
+          annotations = options[:annotations] || Rails::SourceAnnotationExtractor::Annotation.tags
           tag = (annotations.length > 1)
 
           Rails::SourceAnnotationExtractor.enumerate annotations.join("|"), tag: tag, dirs: directories

data/lib/rails/gem_version.rb

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

data/lib/rails/generators/app_base.rb

@@ -98,7 +98,7 @@ module Rails
                                            desc: "Set up the #{name} with Gemfile pointing to Rails repository"
 
         class_option :master,              type: :boolean, default: false,
-                                           desc: "Set up the #{name} with Gemfile pointing to Rails repository master branch"
+                                           desc: "Set up the #{name} with Gemfile pointing to Rails repository main branch"
 
         class_option :rc,                  type: :string, default: nil,
                                            desc: "Path to file containing extra configuration options for rails command"
@@ -301,16 +301,16 @@ module Rails
           ]
         elsif options.edge?
           [
-            GemfileEntry.github("rails", "rails/rails")
+            GemfileEntry.github("rails", "rails/rails", "main")
           ]
         elsif options.master?
           [
-            GemfileEntry.github("rails", "rails/rails", "master")
+            GemfileEntry.github("rails", "rails/rails", "main")
           ]
         else
           [GemfileEntry.version("rails",
                             rails_version_specifier,
-                            "Bundle edge Rails instead: gem 'rails', github: 'rails/rails'")]
+                            "Bundle edge Rails instead: gem 'rails', github: 'rails/rails', branch: 'main'")]
         end
       end
 

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

@@ -2,7 +2,7 @@ APP_ROOT = File.expand_path('..', __dir__)
 Dir.chdir(APP_ROOT) do
   yarn = ENV["PATH"].split(File::PATH_SEPARATOR).
     select { |dir| File.expand_path(dir) != __dir__ }.
-    product(["yarn", "yarn.exe"]).
+    product(["yarn", "yarn.cmd", "yarn.ps1"]).
     map { |dir, file| File.expand_path(file, dir) }.
     find { |file| File.executable?(file) }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: railties
 version: !ruby/object:Gem::Version
-  version: 6.1.1
+  version: 6.1.2
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-07 00:00:00.000000000 Z
+date: 2021-02-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.1
+        version: 6.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.1
+        version: 6.1.2
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.1
+        version: 6.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.1
+        version: 6.1.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.1
+        version: 6.1.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.1
+        version: 6.1.2
 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.1/railties/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v6.1.1/
+  changelog_uri: https://github.com/rails/rails/blob/v6.1.2/railties/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v6.1.2/
   mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
-  source_code_uri: https://github.com/rails/rails/tree/v6.1.1/railties
+  source_code_uri: https://github.com/rails/rails/tree/v6.1.2/railties
 post_install_message:
 rdoc_options:
 - "--exclude"