From 692bb7cebc7df6494adf6b068321eb3fc29acaf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Wed, 30 Dec 2015 17:42:19 -0200
Subject: [PATCH] Add sass-rails back to the default Gemfile

It was removed by mistake at 877a411d0c16baa4e670dae9a28f5cfcc201adc1
---
 railties/lib/rails/generators/app_base.rb      | 2 ++
 railties/test/generators/app_generator_test.rb | 7 +++++++
 2 files changed, 9 insertions(+)

diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index 064b109a6f..297ccb1dbf 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -281,6 +281,8 @@ def assets_gemfile_entry
         return [] if options[:skip_sprockets]
 
         gems = []
+        gems << GemfileEntry.version('sass-rails', '~> 5.0',
+                                     'Use SCSS for stylesheets')
 
         gems << GemfileEntry.version('uglifier',
                                    '>= 1.3.0',
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index 314d8c50b0..e5480180ce 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -361,6 +361,13 @@ def test_generator_if_skip_action_mailer_is_given
     end
   end
 
+  def test_generator_has_assets_gems
+    run_generator
+
+    assert_gem 'sass-rails'
+    assert_gem 'uglifier'
+  end
+
   def test_generator_if_skip_sprockets_is_given
     run_generator [destination_root, "--skip-sprockets"]
     assert_no_file "config/initializers/assets.rb"
-- 
GitLab