From 61fcd35d477fb900037f914d4dfb262a2279ffd3 Mon Sep 17 00:00:00 2001
From: Diego Araújo <diegoamc90@gmail.com>
Date: Mon, 13 Oct 2014 17:02:47 -0300
Subject: [PATCH] cucumber-rails

---
 Gemfile      |  2 +-
 Gemfile.lock | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Gemfile b/Gemfile
index be07f9f..ca5a62a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -28,7 +28,7 @@ gem 'turbolinks'
 gem 'jbuilder', '~> 2.1.2'
 
 # For user authentication and everything else
-gem 'devise', '~> 3.3.0'
+gem 'devise', '~> 3.4.0'
 
 # Kalibro integration
 gem 'kalibro_gatekeeper_client', '~> 1.0.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 1179d31..ee08d6d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -59,7 +59,7 @@ GEM
     capistrano-rvm (0.1.1)
       capistrano (~> 3.0)
       sshkit (~> 1.2)
-    capybara (2.4.3)
+    capybara (2.4.4)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
@@ -90,10 +90,10 @@ GEM
       gherkin (~> 2.12)
       multi_json (>= 1.7.5, < 2.0)
       multi_test (>= 0.1.1)
-    cucumber-rails (1.4.1)
+    cucumber-rails (1.4.2)
       capybara (>= 1.1.2, < 3)
       cucumber (>= 1.3.8, < 2)
-      mime-types (~> 1.16)
+      mime-types (>= 1.16, < 3)
       nokogiri (~> 1.5)
       rails (>= 3, < 5)
     dalli (2.7.2)
@@ -234,10 +234,10 @@ GEM
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.1.4)
+    sprockets-rails (2.2.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
-      sprockets (~> 2.8)
+      sprockets (>= 2.8, < 4.0)
     sqlite3 (1.3.9)
     sshkit (1.5.1)
       colorize
--
libgit2 0.21.2