From 99acd32fe1dfbb75b997b945488e3b469569ff17 Mon Sep 17 00:00:00 2001
From: Diego Araújo <diegoamc90@gmail.com>
Date: Fri, 19 Jun 2015 15:01:50 -0300
Subject: [PATCH] Updated konacha and sprockets.

---
 Gemfile      |  4 ++--
 Gemfile.lock | 21 +++++++++------------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/Gemfile b/Gemfile
index 18c51d8..f503666 100644
--- a/Gemfile
+++ b/Gemfile
@@ -103,7 +103,7 @@ group :development, :test do
   gem 'capistrano-rvm', "~>0.1.0"
 
   # JavaScript unit tests
-  gem "konacha", "~> 3.3.0"
+  gem "konacha"
 
   # Better error interface
   gem 'better_errors'
@@ -112,7 +112,7 @@ group :development, :test do
   # Localization assistance
   gem 'i18n_generators'
 
-  gem 'sprockets', '~>2.12.3' # spckets 3.0.3 breaks konacha
+  gem 'sprockets'
 
   # Mocks and stubs for javascript tests
   gem 'sinon-rails'
diff --git a/Gemfile.lock b/Gemfile.lock
index b6a73ae..9f236ba 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -139,7 +139,6 @@ 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)
@@ -160,12 +159,13 @@ GEM
     kalibro_client (0.3.0)
       activesupport (>= 2.2.1)
       faraday_middleware (~> 0.9.0)
-    konacha (3.3.0)
+    konacha (3.5.1)
       actionpack (>= 3.1, < 5)
       capybara
       colorize
       railties (>= 3.1, < 5)
-      sprockets
+      sprockets (>= 2, < 4)
+      tilt
     less (2.6.0)
       commonjs (~> 0.2.7)
     less-rails (2.7.0)
@@ -188,12 +188,12 @@ GEM
       ntlm-http (~> 0.1, >= 0.1.1)
       webrobots (>= 0.0.9, < 0.2)
     metaclass (0.0.4)
-    mime-types (2.5)
+    mime-types (2.6.1)
     mini_portile (0.6.2)
     minitest (5.7.0)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
-    multi_json (1.11.0)
+    multi_json (1.11.1)
     multi_test (0.1.2)
     multipart-post (2.0.0)
     net-http-digest_auth (1.4)
@@ -211,7 +211,7 @@ GEM
       cliver (~> 0.3.1)
       multi_json (~> 1.0)
       websocket-driver (>= 0.2.0)
-    rack (1.6.1)
+    rack (1.6.4)
     rack-test (0.6.3)
       rack (>= 1.0)
     rails (4.2.1)
@@ -280,11 +280,8 @@ GEM
     sinon-rails (1.15.0)
       railties (>= 3.1)
     spring (1.3.6)
-    sprockets (2.12.3)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
+    sprockets (3.2.0)
       rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
     sprockets-rails (2.3.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
@@ -352,7 +349,7 @@ DEPENDENCIES
   jquery-rails
   jquery-ui-rails (~> 5.0.0)
   kalibro_client (~> 0.3.0)
-  konacha (~> 3.3.0)
+  konacha
   mocha
   pg (~> 0.18.1)
   poltergeist (~> 1.6.0)
@@ -365,7 +362,7 @@ DEPENDENCIES
   simplecov
   sinon-rails
   spring
-  sprockets (~> 2.12.3)
+  sprockets
   sqlite3
   therubyracer
   turbolinks
--
libgit2 0.21.2