From 93c7c0e37718678b0aad8a693be53983ec539f13 Mon Sep 17 00:00:00 2001
From: Philipp Fischbeck <philipp.fischbeck@student.hpi.uni-potsdam.de>
Date: Mon, 5 Jan 2015 12:00:30 +0100
Subject: [PATCH] Update 'sass-rails'

---
 Gemfile      |  2 +-
 Gemfile.lock | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Gemfile b/Gemfile
index a94f176..c687f7e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,7 +6,7 @@ gem 'rails', '4.2.0'
 # Use sqlite3 as the database for Active Record
 gem 'sqlite3'
 # Use SCSS for stylesheets
-gem 'sass-rails', '~> 4.0.3'
+gem 'sass-rails', '~> 5.0.1'
 # Use Uglifier as compressor for JavaScript assets
 gem 'uglifier', '>= 1.3.0'
 # Use CoffeeScript for .js.coffee assets and views
diff --git a/Gemfile.lock b/Gemfile.lock
index 37f0ee7..1af7ade 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -120,12 +120,13 @@ GEM
       json (~> 1.4)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    sass (3.2.19)
-    sass-rails (4.0.5)
+    sass (3.4.9)
+    sass-rails (5.0.1)
       railties (>= 4.0.0, < 5.0)
-      sass (~> 3.2.2)
-      sprockets (~> 2.8, < 3.0)
-      sprockets-rails (~> 2.0)
+      sass (~> 3.1)
+      sprockets (>= 2.8, < 4.0)
+      sprockets-rails (>= 2.0, < 4.0)
+      tilt (~> 1.1)
     sdoc (0.4.1)
       json (~> 1.7, >= 1.7.7)
       rdoc (~> 4.0)
@@ -181,7 +182,7 @@ DEPENDENCIES
   jquery-rails
   mathjax-rails
   rails (= 4.2.0)
-  sass-rails (~> 4.0.3)
+  sass-rails (~> 5.0.1)
   sdoc (~> 0.4.0)
   sqlite3
   turbolinks