1 files changed, 18 insertions, 9 deletions
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index 119a7cb829..0f44f4694e 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -174,6 +174,10 @@ module Rails
         options[value] ? '# ' : ''
       end
 
+      def keeps?
+        !options[:skip_keeps]
+      end
+
       def sqlite3?
         !options[:skip_active_record] && options[:database] == 'sqlite3'
       end
@@ -201,16 +205,21 @@ module Rails
       end
 
       def rails_gemfile_entry
+        dev_edge_common = [
+            GemfileEntry.github('sprockets-rails', 'rails/sprockets-rails'),
+            GemfileEntry.github('sprockets', 'rails/sprockets'),
+            GemfileEntry.github('sass-rails', 'rails/sass-rails'),
+            GemfileEntry.github('arel', 'rails/arel'),
+            GemfileEntry.github('rack', 'rack/rack')
+          ]
         if options.dev?
           [
-            GemfileEntry.path('rails', Rails::Generators::RAILS_DEV_PATH),
-            GemfileEntry.github('arel', 'rails/arel')
-          ]
+            GemfileEntry.path('rails', Rails::Generators::RAILS_DEV_PATH)
+          ] + dev_edge_common
         elsif options.edge?
           [
-            GemfileEntry.github('rails', 'rails/rails'),
-            GemfileEntry.github('arel', 'rails/arel')
-          ]
+            GemfileEntry.github('rails', 'rails/rails')
+          ] + dev_edge_common
         else
           [GemfileEntry.version('rails',
                             Rails::VERSION::STRING,
@@ -249,8 +258,6 @@ module Rails
         return [] if options[:skip_sprockets]
 
         gems = []
-        gems << GemfileEntry.version('sass-rails', '~> 5.0',
-                                     'Use SCSS for stylesheets')
 
         gems << GemfileEntry.version('uglifier',
                                    '>= 1.3.0',
@@ -260,6 +267,8 @@ module Rails
       end
 
       def jbuilder_gemfile_entry
+        return [] if options[:api]
+
         comment = 'Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder'
         GemfileEntry.version('jbuilder', '~> 2.0', comment)
       end
@@ -355,7 +364,7 @@ module Rails
       end
 
       def keep_file(destination)
-        create_file("#{destination}/.keep") unless options[:skip_keeps]
+        create_file("#{destination}/.keep") if keeps?
       end
     end
   end