From 0a98c398eec673dae80dc41e5df1b156cfb74491 Mon Sep 17 00:00:00 2001
From: Heitor Reis <marcheing@gmail.com>
Date: Fri, 8 May 2015 15:40:09 -0300
Subject: [PATCH] Reversing version of sprockets to 2.12.3

---
 Gemfile      |  3 +++
 Gemfile.lock | 15 ++++++++++-----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index 3885410..603230d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -111,6 +111,8 @@ group :development, :test do
 
   # Localization assistance
   gem 'i18n_generators'
+
+  gem 'sprockets', '~>2.12.3' # spckets 3.0.3 breaks konacha
 end
 
 # Acceptance tests
@@ -123,6 +125,7 @@ group :cucumber do
   gem 'poltergeist', '~> 1.6.0'
 end
 
+
 # Use ActiveModel has_secure_password
 # gem 'bcrypt', '~> 3.1.7'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index f401a95..6c89204 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/seyhunak/twitter-bootstrap-rails.git
-  revision: cd805c7217703e60ff82576525a3ba03a3c2bc35
+  revision: ba1e2bc2dad7f1e3c8b754f765dac7f4410fa06a
   specs:
     twitter-bootstrap-rails (3.2.1)
       actionpack (>= 3.1)
@@ -77,7 +77,7 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    chart-js-rails (0.0.8)
+    chart-js-rails (0.0.9)
       railties (> 3.1)
     cliver (0.3.2)
     codeclimate-test-reporter (0.4.7)
@@ -139,6 +139,7 @@ GEM
     globalid (0.3.5)
       activesupport (>= 4.1.0)
     google-analytics-rails (0.0.6)
+    hike (1.2.3)
     http-cookie (1.0.2)
       domain_name (~> 0.5)
     http_accept_language (2.0.5)
@@ -146,7 +147,7 @@ GEM
     i18n_generators (1.2.1)
       mechanize
       rails (>= 3.0.0)
-    jbuilder (2.2.12)
+    jbuilder (2.2.13)
       activesupport (>= 3.0.0, < 5)
       multi_json (~> 1.2)
     jquery-rails (4.0.3)
@@ -260,7 +261,7 @@ GEM
       rspec-support (~> 3.2.0)
     rspec-support (3.2.2)
     sass (3.4.13)
-    sass-rails (5.0.2)
+    sass-rails (5.0.3)
       railties (>= 4.0.0, < 5.0)
       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
@@ -277,8 +278,11 @@ GEM
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
     spring (1.3.6)
-    sprockets (3.0.3)
+    sprockets (2.12.3)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
       rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
     sprockets-rails (2.3.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
@@ -358,6 +362,7 @@ DEPENDENCIES
   shoulda-matchers (~> 2.8.0)
   simplecov
   spring
+  sprockets (~> 2.12.3)
   sqlite3
   therubyracer
   turbolinks
--
libgit2 0.21.2