From 8d917742e22f1df03f5be95f94c21084921fa38f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@jhass.eu>
Date: Mon, 7 Sep 2015 10:37:43 +0200
Subject: [PATCH] bump capybara

---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 9b5d14ed29..124e39d338 100644
--- a/Gemfile
+++ b/Gemfile
@@ -259,7 +259,7 @@ group :test do
 
   # Cucumber (integration tests)
 
-  gem "capybara",           "2.4.4"
+  gem "capybara",           "2.5.0"
   gem "database_cleaner" ,  "1.4.1"
   gem "selenium-webdriver", "2.47.1"
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 067883a619..bef34ff438 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -72,7 +72,7 @@ GEM
     builder (3.2.2)
     byebug (4.0.5)
       columnize (= 0.9.0)
-    capybara (2.4.4)
+    capybara (2.5.0)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
@@ -756,7 +756,7 @@ DEPENDENCIES
   autoprefixer-rails (= 6.0.3)
   backbone-on-rails (= 1.2.0.0)
   bootstrap-sass (= 2.3.2.2)
-  capybara (= 2.4.4)
+  capybara (= 2.5.0)
   carrierwave (= 0.10.0)
   compass-rails (= 2.0.4)
   configurate (= 0.3.1)
-- 
GitLab