From 78856fca41d29467c6ae2b4e0c52a16eb88ae4d2 Mon Sep 17 00:00:00 2001
From: Jake Benilov <benilov@gmail.com>
Date: Fri, 29 Aug 2014 10:00:01 +0000
Subject: [PATCH] Bump ruby to 2.1.2

This is mainly done to stay on a more current version of ruby.
This change involved bumping the `sass` gem because the old gem had issues
with the new ruby.
---
 .ruby-version | 2 +-
 Gemfile       | 2 +-
 Gemfile.lock  | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.ruby-version b/.ruby-version
index 7a895c214..eca07e4c1 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-1.9.3-p484
+2.1.2
diff --git a/Gemfile b/Gemfile
index 6538a2c8a..5355fdd2b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -10,7 +10,7 @@ gem 'logstasher', '0.4.8'
 group :assets do
   gem "therubyracer", "0.12.0"
   gem 'uglifier'
-  gem 'sass', '3.2.1'
+  gem 'sass', '3.4.2'
   gem 'sass-rails', '3.2.5'
 end
 
diff --git a/Gemfile.lock b/Gemfile.lock
index b89774161..7b718325d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -121,7 +121,7 @@ GEM
     ref (1.0.5)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    sass (3.2.1)
+    sass (3.4.2)
     sass-rails (3.2.5)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
@@ -168,7 +168,7 @@ DEPENDENCIES
   mocha (= 0.13.3)
   plek (= 1.7.0)
   rails (= 3.2.18)
-  sass (= 3.2.1)
+  sass (= 3.4.2)
   sass-rails (= 3.2.5)
   shoulda (= 2.11.3)
   therubyracer (= 0.12.0)