Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix branch for rails new --edge on 6-1-stable #41454

Merged
merged 1 commit into from Feb 16, 2021
Merged

Fix branch for rails new --edge on 6-1-stable #41454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion railties/lib/rails/generators/app_base.rb
View file
Open in desktop
Expand Up @@ -301,7 +301,7 @@ def rails_gemfile_entry
]
elsif options.edge?
[
GemfileEntry.github("rails", "rails/rails", "main")
GemfileEntry.github("rails", "rails/rails", "6-1-stable")
]
elsif options.master?
[
Expand Down
2 changes: 1 addition & 1 deletion railties/test/generators/app_generator_test.rb
View file
Open in desktop
Expand Up @@ -863,7 +863,7 @@ def test_edge_option
generator([destination_root], edge: true, skip_webpack_install: true)

assert_bundler_command_called("install")
assert_file "Gemfile", %r{^gem\s+["']rails["'],\s+github:\s+["']#{Regexp.escape("rails/rails")}["'],\s+branch:\s+["']main["']$}
assert_file "Gemfile", %r{^gem\s+["']rails["'],\s+github:\s+["']#{Regexp.escape("rails/rails")}["'],\s+branch:\s+["']#{Regexp.escape("6-1-stable")}["']$}
end

def test_master_option
Expand Down
2 changes: 1 addition & 1 deletion railties/test/generators/plugin_generator_test.rb
View file
Open in desktop
Expand Up @@ -216,7 +216,7 @@ def test_dev_option

def test_edge_option
assert_generates_without_bundler(edge: true)
assert_file "Gemfile", %r{^gem\s+["']rails["'],\s+github:\s+["']#{Regexp.escape("rails/rails")}["'],\s+branch:\s+["']main["']$}
assert_file "Gemfile", %r{^gem\s+["']rails["'],\s+github:\s+["']#{Regexp.escape("rails/rails")}["'],\s+branch:\s+["']#{Regexp.escape("6-1-stable")}["']$}
end

def test_generation_does_not_run_bundle_install_with_full_and_mountable
Expand Down