From 0c5c737a38f9611b2bdc3a295789d22c20bbaad6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@jhass.eu>
Date: Tue, 14 Oct 2014 14:03:26 +0200
Subject: [PATCH] bump cucumber-rails

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

diff --git a/Gemfile b/Gemfile
index 4ff436116..396357a8b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -226,7 +226,7 @@ group :development, :test do
   gem 'rspec-rails',     '3.1.0'
 
   # Cucumber (integration tests)
-  gem 'cucumber-rails',     '1.4.1', :require => false
+  gem 'cucumber-rails',     '1.4.2', :require => false
 
   # Jasmine (client side application tests (JS))
   gem 'jasmine',              '2.0.2'
diff --git a/Gemfile.lock b/Gemfile.lock
index e6c16af82..88b4f5e88 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -102,16 +102,16 @@ GEM
     connection_pool (2.0.0)
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
-    cucumber (1.3.16)
+    cucumber (1.3.17)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
       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)
     database_cleaner (1.3.0)
@@ -269,7 +269,7 @@ GEM
       redcarpet (>= 2.0)
     messagebus_ruby_api (1.0.3)
     method_source (0.8.2)
-    mime-types (1.25.1)
+    mime-types (2.4.1)
     mini_magick (3.8.1)
       subexec (~> 0.2.1)
     mini_portile (0.5.3)
@@ -531,7 +531,7 @@ DEPENDENCIES
   carrierwave (= 0.10.0)
   compass-rails (= 2.0.0)
   configurate (= 0.2.0)
-  cucumber-rails (= 1.4.1)
+  cucumber-rails (= 1.4.2)
   database_cleaner (= 1.3.0)
   devise (= 3.4.0)
   devise_lastseenable (= 0.0.4)