From 0c2c32d3d699e211adb458e60733f042b64c3cc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@riseup.net>
Date: Mon, 24 Jul 2017 12:55:08 +0200
Subject: Fix warnings in railties tests

This warning has been fixed in sass-rails. This change picks up the fix.
---
 Gemfile      |  2 +-
 Gemfile.lock | 30 ++++++++++++++++++++----------
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/Gemfile b/Gemfile
index 734fb68d36..9a07908885 100644
--- a/Gemfile
+++ b/Gemfile
@@ -22,7 +22,7 @@ gem "capybara", "~> 2.13"
 gem "rack-cache", "~> 1.2"
 gem "jquery-rails"
 gem "coffee-rails"
-gem "sass-rails"
+gem "sass-rails", github: "rails/sass-rails", branch: "5-0-stable"
 gem "turbolinks", "~> 5"
 
 # require: false so bcrypt is loaded only when has_secure_password is used.
diff --git a/Gemfile.lock b/Gemfile.lock
index 68b27bfc1e..175dd5ecf7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -35,6 +35,18 @@ GIT
   specs:
     arel (8.0.0)
 
+GIT
+  remote: https://github.com/rails/sass-rails.git
+  revision: bb5c1d34e8acad2e2960cc785184ffe17d7b3bca
+  branch: 5-0-stable
+  specs:
+    sass-rails (5.0.6)
+      railties (>= 4.0.0, < 6)
+      sass (~> 3.1)
+      sprockets (>= 2.8, < 4.0)
+      sprockets-rails (>= 2.0, < 4.0)
+      tilt (>= 1.1, < 3)
+
 PATH
   remote: .
   specs:
@@ -305,13 +317,11 @@ GEM
     rubyzip (1.2.0)
     rufus-scheduler (3.3.2)
       tzinfo
-    sass (3.4.23)
-    sass-rails (5.0.6)
-      railties (>= 4.0.0, < 6)
-      sass (~> 3.1)
-      sprockets (>= 2.8, < 4.0)
-      sprockets-rails (>= 2.0, < 4.0)
-      tilt (>= 1.1, < 3)
+    sass (3.5.1)
+      sass-listen (~> 4.0.0)
+    sass-listen (4.0.0)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
     sdoc (1.0.0.rc2)
       rdoc (~> 5.0)
     selenium-webdriver (3.0.5)
@@ -355,7 +365,7 @@ GEM
       rack (>= 1, < 3)
     thread (0.1.7)
     thread_safe (0.3.6)
-    tilt (2.0.5)
+    tilt (2.0.8)
     turbolinks (5.0.1)
       turbolinks-source (~> 5)
     turbolinks-source (5.0.0)
@@ -430,7 +440,7 @@ DEPENDENCIES
   resque
   resque-scheduler
   rubocop (>= 0.47)
-  sass-rails
+  sass-rails!
   sdoc (> 1.0.0.rc1, < 2.0)
   sequel
   sidekiq
@@ -448,4 +458,4 @@ DEPENDENCIES
   websocket-client-simple!
 
 BUNDLED WITH
-   1.15.1
+   1.15.3
-- 
cgit v1.2.3