From a9935614209f7d4154e11d356c1114d88bc763ed Mon Sep 17 00:00:00 2001
From: James Edwards-Jones <jedwardsjones@gitlab.com>
Date: Wed, 1 Mar 2017 02:17:21 +0000
Subject: Update Capybara gem to 2.12.1

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

diff --git a/Gemfile b/Gemfile
index 429454b9ed6..06ab71d7a1c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -293,7 +293,7 @@ group :development, :test do
   # Generate Fake data
   gem 'ffaker', '~> 2.4'
 
-  gem 'capybara',            '~> 2.6.2'
+  gem 'capybara',            '~> 2.12'
   gem 'capybara-screenshot', '~> 1.0.0'
   gem 'poltergeist',         '~> 1.9.0'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 472cee510cb..a04a637af6a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -93,7 +93,7 @@ GEM
       bundler (~> 1.2)
       thor (~> 0.18)
     byebug (9.0.6)
-    capybara (2.6.2)
+    capybara (2.12.1)
       addressable
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
@@ -844,7 +844,7 @@ DEPENDENCIES
   browser (~> 2.2)
   bullet (~> 5.2.0)
   bundler-audit (~> 0.5.0)
-  capybara (~> 2.6.2)
+  capybara (~> 2.12)
   capybara-screenshot (~> 1.0.0)
   carrierwave (~> 0.10.0)
   charlock_holmes (~> 0.7.3)
-- 
cgit v1.2.1