From bf6f6e84b37f387859224b85bea37c15f3724005 Mon Sep 17 00:00:00 2001
From: echarp <emmanuel.charpentier@free.fr>
Date: Tue, 21 Oct 2014 23:40:54 +0200
Subject: [PATCH] =?UTF-8?q?Passage=20=C3=A0=20sass-rails=205=20beta=201?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Gemfile      |  8 ++++----
 Gemfile.lock | 37 ++++++++++++++++++++++---------------
 2 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/Gemfile b/Gemfile
index 8adc7e5a..de96310c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,11 +4,9 @@ source 'https://rubygems.org'
 gem 'simple_calendar'
 
 gem 'rails'
-# Use SCSS for stylesheets
-gem 'sass-rails', '~> 4.0.3'
 
-# Use Uglifier as compressor for JavaScript assets
-gem 'uglifier'
+# Use SCSS for stylesheets
+gem 'sass-rails', '~> 5.0.0.beta1'
 
 # Use CoffeeScript for .js.coffee assets and views
 gem 'coffee-rails'
@@ -24,6 +22,8 @@ gem 'jquery-rails'
 gem 'turbolinks'
 gem 'jquery-turbolinks'
 
+# Use Uglifier as compressor for JavaScript assets
+gem 'uglifier'
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
 gem 'jbuilder', '~> 2.0'
 # bundle exec rake doc:rails generates the API under doc/api.
diff --git a/Gemfile.lock b/Gemfile.lock
index c939e036..927e73e2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -78,8 +78,8 @@ GEM
       rack (>= 0.9.0)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
-    bourbon (3.2.3)
-      sass (~> 3.2)
+    bourbon (4.0.2)
+      sass (~> 3.3)
       thor
     brakeman (2.6.3)
       erubis (~> 2.6)
@@ -105,12 +105,20 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.8.0)
-    compass (0.12.7)
+    compass (1.0.1)
       chunky_png (~> 1.2)
-      fssm (>= 0.2.7)
-      sass (~> 3.2.19)
-    compass-rails (2.0.0)
-      compass (>= 0.12.2)
+      compass-core (~> 1.0.1)
+      compass-import-once (~> 1.0.5)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+      sass (>= 3.3.13, < 3.5)
+    compass-core (1.0.1)
+      multi_json (~> 1.0)
+      sass (>= 3.3.0, < 3.5)
+    compass-import-once (1.0.5)
+      sass (>= 3.2, < 3.5)
+    compass-rails (2.0.1)
+      compass (~> 1.0.0)
     debug_inspector (0.0.2)
     devise (3.4.0)
       bcrypt (~> 3.0)
@@ -141,7 +149,6 @@ GEM
     formtastic (3.0.0)
       actionpack (>= 3.2.13)
     formtastic_i18n (0.1.1)
-    fssm (0.2.10)
     geocoder (1.2.5)
     guard (2.6.1)
       formatador (>= 0.2.4)
@@ -285,12 +292,12 @@ GEM
       sexp_processor (~> 4.0)
     ruby_parser (3.5.0)
       sexp_processor (~> 4.1)
-    sass (3.2.19)
-    sass-rails (4.0.3)
+    sass (3.4.6)
+    sass-rails (5.0.0.beta1)
       railties (>= 4.0.0, < 5.0)
-      sass (~> 3.2.0)
-      sprockets (~> 2.8, <= 2.11.0)
-      sprockets-rails (~> 2.0)
+      sass (~> 3.2)
+      sprockets (~> 2.12)
+      sprockets-rails (>= 2.0, < 4.0)
     sdoc (0.4.1)
       json (~> 1.7, >= 1.7.7)
       rdoc (~> 4.0)
@@ -310,7 +317,7 @@ GEM
       tilt (>= 1.3.3, < 2.1)
     slop (3.6.0)
     spring (1.1.3)
-    sprockets (2.11.0)
+    sprockets (2.12.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
@@ -396,7 +403,7 @@ DEPENDENCIES
   rails
   rails-i18n
   redcarpet
-  sass-rails (~> 4.0.3)
+  sass-rails (~> 5.0.0.beta1)
   sdoc (~> 0.4.0)
   select2-rails
   simple_calendar