Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2015-07-07 02:50:36 +0300
committerRobert Speicher <rspeicher@gmail.com>2015-07-07 05:39:55 +0300
commitea565653a06125689cf30326bacfae812e1f2800 (patch)
treeb6c5416790a93d82e327ed9644115c61072949b9
parent9e53ad5e2075640440b90fa5ee7e9951bbd28dac (diff)
Bump capybara to 2.4.0
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock6
2 files changed, 4 insertions, 4 deletions
diff --git a/Gemfile b/Gemfile
index 3593e54f0d7..cde8d631ab5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -250,7 +250,7 @@ group :development, :test do
# Generate Fake data
gem 'ffaker', '~> 2.0.0'
- gem 'capybara', '~> 2.3.0'
+ gem 'capybara', '~> 2.4.0'
gem 'capybara-screenshot', '~> 1.0.0'
gem 'poltergeist', '~> 1.6.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index a4eb22e5b80..8114063cee0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -82,7 +82,7 @@ GEM
columnize (~> 0.8)
debugger-linecache (~> 1.2)
cal-heatmap-rails (0.0.1)
- capybara (2.3.0)
+ capybara (2.4.4)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
@@ -753,7 +753,7 @@ DEPENDENCIES
browser (~> 0.8.0)
byebug
cal-heatmap-rails (~> 0.0.1)
- capybara (~> 2.3.0)
+ capybara (~> 2.4.0)
capybara-screenshot (~> 1.0.0)
carrierwave
charlock_holmes
@@ -878,4 +878,4 @@ DEPENDENCIES
wikicloth (= 0.8.1)
BUNDLED WITH
- 1.10.4
+ 1.10.5