railties 6.1.1 → 6.1.3

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 8e4b20eb9abd2c8e71d7c802b1adc936d2e0e3fa7afed6c547c95389bb31952a
4
- data.tar.gz: efbbfbb14c05be75a8eff3da93a93cb7a53e9aafd357a9af14bd262b50b5f7a8
3
+ metadata.gz: 55150c81c10ad3400b9efd1be5186e637b051bebfa22c5f0d7e7ea2b99a7596c
4
+ data.tar.gz: c5a1f224c6709b3cb3b15cb77ef4e8b0154986b22dead106571918f796a675e7
5
5
  SHA512:
6
- metadata.gz: beeedae94ff8b9e2f457a988901f9c917ef4f6d1003d98a1fc0fa01ac9f8c314d22d386b9fc2a4b2aae3d9bbcfa3f4621b844c10c4d2f3f28fe0775b30322a55
7
- data.tar.gz: 37b5a5f78bc733c05f52e071bcbc83f50894bdaa26a2a5fa60f779512640fc2b5463f436ed8073c0f5effe4dfe3dc23a02cde10296b062c787b1e6ef004809a1
6
+ metadata.gz: d0e8a704a36ca741bf4441fe33558be0a76a8069d6d8c1b1daacaa3621134542d9058c3ae2b979dfb19882c6d058dfff771be2f5640328cd253a8f12dcf5865e
7
+ data.tar.gz: f5017766dcc4a5bde98b86e161320c511c237083d98c854dbc47ca18f62d4c0133463bafa8cc4b8b21fee336d6932b71d31be5b38401f57aa8a6687fbcad5d09
data/CHANGELOG.md CHANGED
@@ -1,3 +1,18 @@
1
+ ## Rails 6.1.3 (February 17, 2021) ##
2
+
3
+ * No changes.
4
+
5
+
6
+ ## Rails 6.1.2.1 (February 10, 2021) ##
7
+
8
+ * No changes.
9
+
10
+
11
+ ## Rails 6.1.2 (February 09, 2021) ##
12
+
13
+ * No changes.
14
+
15
+
1
16
  ## Rails 6.1.1 (January 07, 2021) ##
2
17
 
3
18
  * Allow spaces in path to Yarn binstub and only run on precompile if needed.
data/README.rdoc CHANGED
@@ -17,7 +17,7 @@ The latest version of Railties can be installed with RubyGems:
17
17
 
18
18
  Source code can be downloaded as part of the Rails project on GitHub
19
19
 
20
- * https://github.com/rails/rails/tree/master/railties
20
+ * https://github.com/rails/rails/tree/main/railties
21
21
 
22
22
  == License
23
23
 
@@ -189,7 +189,7 @@ module Rails
189
189
 
190
190
  class EdgeTask < RepoTask
191
191
  def rails_version
192
- "master@#{`git rev-parse HEAD`[0, 7]}"
192
+ "main@#{`git rev-parse HEAD`[0, 7]}"
193
193
  end
194
194
  end
195
195
 
@@ -5,7 +5,7 @@ require "rails/source_annotation_extractor"
5
5
  module Rails
6
6
  module Command
7
7
  class NotesCommand < Base # :nodoc:
8
- class_option :annotations, aliases: "-a", desc: "Filter by specific annotations, e.g. Foobar TODO", type: :array, default: Rails::SourceAnnotationExtractor::Annotation.tags
8
+ class_option :annotations, aliases: "-a", desc: "Filter by specific annotations, e.g. Foobar TODO", type: :array
9
9
 
10
10
  def perform(*)
11
11
  require_application_and_environment!
@@ -15,7 +15,7 @@ module Rails
15
15
 
16
16
  private
17
17
  def display_annotations
18
- annotations = options[:annotations]
18
+ annotations = options[:annotations] || Rails::SourceAnnotationExtractor::Annotation.tags
19
19
  tag = (annotations.length > 1)
20
20
 
21
21
  Rails::SourceAnnotationExtractor.enumerate annotations.join("|"), tag: tag, dirs: directories
@@ -9,7 +9,7 @@ module Rails
9
9
  module VERSION
10
10
  MAJOR = 6
11
11
  MINOR = 1
12
- TINY = 1
12
+ TINY = 3
13
13
  PRE = nil
14
14
 
15
15
  STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
@@ -98,7 +98,7 @@ module Rails
98
98
  desc: "Set up the #{name} with Gemfile pointing to Rails repository"
99
99
 
100
100
  class_option :master, type: :boolean, default: false,
101
- desc: "Set up the #{name} with Gemfile pointing to Rails repository master branch"
101
+ desc: "Set up the #{name} with Gemfile pointing to Rails repository main branch"
102
102
 
103
103
  class_option :rc, type: :string, default: nil,
104
104
  desc: "Path to file containing extra configuration options for rails command"
@@ -301,16 +301,16 @@ module Rails
301
301
  ]
302
302
  elsif options.edge?
303
303
  [
304
- GemfileEntry.github("rails", "rails/rails")
304
+ GemfileEntry.github("rails", "rails/rails", "6-1-stable")
305
305
  ]
306
306
  elsif options.master?
307
307
  [
308
- GemfileEntry.github("rails", "rails/rails", "master")
308
+ GemfileEntry.github("rails", "rails/rails", "main")
309
309
  ]
310
310
  else
311
311
  [GemfileEntry.version("rails",
312
312
  rails_version_specifier,
313
- "Bundle edge Rails instead: gem 'rails', github: 'rails/rails'")]
313
+ "Bundle edge Rails instead: gem 'rails', github: 'rails/rails', branch: 'main'")]
314
314
  end
315
315
  end
316
316
 
@@ -429,11 +429,19 @@ module Rails
429
429
  end
430
430
 
431
431
  def run_webpack
432
- if webpack_install?
433
- rails_command "webpacker:install"
434
- if options[:webpack] && options[:webpack] != "webpack"
435
- rails_command "webpacker:install:#{options[:webpack]}"
436
- end
432
+ return unless webpack_install?
433
+
434
+ unless bundle_install?
435
+ say <<~EXPLAIN
436
+ Skipping `rails webpacker:install` because `bundle install` was skipped.
437
+ To complete setup, you must run `bundle install` followed by `rails webpacker:install`.
438
+ EXPLAIN
439
+ return
440
+ end
441
+
442
+ rails_command "webpacker:install"
443
+ if options[:webpack] && options[:webpack] != "webpack"
444
+ rails_command "webpacker:install:#{options[:webpack]}"
437
445
  end
438
446
  end
439
447
 
@@ -104,9 +104,7 @@ module Rails
104
104
  end
105
105
 
106
106
  def yarn_when_updating
107
- return if File.exist?("bin/yarn")
108
-
109
- template "bin/yarn" do |content|
107
+ template "bin/yarn", force: true do |content|
110
108
  "#{shebang}\n" + content
111
109
  end
112
110
 
@@ -3,7 +3,7 @@ if !defined?(Spring) && [nil, "development", "test"].include?(ENV["RAILS_ENV"])
3
3
  require "bundler"
4
4
 
5
5
  # Load Spring without loading other gems in the Gemfile, for speed.
6
- Bundler.locked_gems.specs.find { |spec| spec.name == "spring" }&.tap do |spring|
6
+ Bundler.locked_gems&.specs&.find { |spec| spec.name == "spring" }&.tap do |spring|
7
7
  Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path
8
8
  gem "spring", spring.version
9
9
  require "spring/binstub"
@@ -2,7 +2,7 @@ APP_ROOT = File.expand_path('..', __dir__)
2
2
  Dir.chdir(APP_ROOT) do
3
3
  yarn = ENV["PATH"].split(File::PATH_SEPARATOR).
4
4
  select { |dir| File.expand_path(dir) != __dir__ }.
5
- product(["yarn", "yarn.exe"]).
5
+ product(["yarn", "yarn.cmd", "yarn.ps1"]).
6
6
  map { |dir, file| File.expand_path(file, dir) }.
7
7
  find { |file| File.executable?(file) }
8
8
 
@@ -72,7 +72,7 @@ module Rails
72
72
  #
73
73
  # See <tt>#find_in</tt> for a list of file extensions that will be taken into account.
74
74
  #
75
- # This class method is the single entry point for the `rails notes` command.
75
+ # This class method is the single entry point for the <tt>rails notes</tt> command.
76
76
  def self.enumerate(tag = nil, options = {})
77
77
  tag ||= Annotation.tags.join("|")
78
78
  extractor = new(tag)
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: railties
3
3
  version: !ruby/object:Gem::Version
4
- version: 6.1.1
4
+ version: 6.1.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - David Heinemeier Hansson
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2021-01-07 00:00:00.000000000 Z
11
+ date: 2021-02-17 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activesupport
@@ -16,28 +16,28 @@ dependencies:
16
16
  requirements:
17
17
  - - '='
18
18
  - !ruby/object:Gem::Version
19
- version: 6.1.1
19
+ version: 6.1.3
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - '='
25
25
  - !ruby/object:Gem::Version
26
- version: 6.1.1
26
+ version: 6.1.3
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: actionpack
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - '='
32
32
  - !ruby/object:Gem::Version
33
- version: 6.1.1
33
+ version: 6.1.3
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - '='
39
39
  - !ruby/object:Gem::Version
40
- version: 6.1.1
40
+ version: 6.1.3
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: rake
43
43
  requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
86
86
  requirements:
87
87
  - - '='
88
88
  - !ruby/object:Gem::Version
89
- version: 6.1.1
89
+ version: 6.1.3
90
90
  type: :development
91
91
  prerelease: false
92
92
  version_requirements: !ruby/object:Gem::Requirement
93
93
  requirements:
94
94
  - - '='
95
95
  - !ruby/object:Gem::Version
96
- version: 6.1.1
96
+ version: 6.1.3
97
97
  description: 'Rails internals: application bootup, plugins, generators, and rake tasks.'
98
98
  email: david@loudthinking.com
99
99
  executables:
@@ -426,10 +426,10 @@ licenses:
426
426
  - MIT
427
427
  metadata:
428
428
  bug_tracker_uri: https://github.com/rails/rails/issues
429
- changelog_uri: https://github.com/rails/rails/blob/v6.1.1/railties/CHANGELOG.md
430
- documentation_uri: https://api.rubyonrails.org/v6.1.1/
429
+ changelog_uri: https://github.com/rails/rails/blob/v6.1.3/railties/CHANGELOG.md
430
+ documentation_uri: https://api.rubyonrails.org/v6.1.3/
431
431
  mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
432
- source_code_uri: https://github.com/rails/rails/tree/v6.1.1/railties
432
+ source_code_uri: https://github.com/rails/rails/tree/v6.1.3/railties
433
433
  post_install_message:
434
434
  rdoc_options:
435
435
  - "--exclude"