Point to 5-0-stable branch in the edge generator

rails · May 10, 2016 · 029351e · 029351e
1 parent e913d7f
commit 029351e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
@@ -234,16 +234,14 @@ def version
       end
 
       def rails_gemfile_entry
-        dev_edge_common = [
-        ]
         if options.dev?
           [
             GemfileEntry.path('rails', Rails::Generators::RAILS_DEV_PATH)
-          ] + dev_edge_common
+          ]
         elsif options.edge?
           [
-            GemfileEntry.github('rails', 'rails/rails')
-          ] + dev_edge_common
+            GemfileEntry.github('rails', 'rails/rails', '5-0-stable')
+          ]
         else
           [GemfileEntry.version('rails',
                             rails_version_specifier,

diff --git a/railties/test/generators/shared_generator_tests.rb b/railties/test/generators/shared_generator_tests.rb
@@ -122,7 +122,7 @@ def test_dev_option
 
   def test_edge_option
     assert_generates_with_bundler edge: true
-    assert_file 'Gemfile', %r{^gem\s+["']rails["'],\s+github:\s+["']#{Regexp.escape("rails/rails")}["']$}
+    assert_file 'Gemfile', %r{^gem\s+["']rails["'],\s+github:\s+["']#{Regexp.escape("rails/rails")}["'],\s+branch:\s+["']#{Regexp.escape("5-0-stable")}["']$}
   end
 
   def test_skip_gemfile