summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-09-07 09:31:41 +0000
committerRémy Coutable <remy@rymai.me>2017-09-07 09:31:41 +0000
commit424c46731018f0232e2b6341f474100cb185c05a (patch)
tree9f2b07170bdbd4165895f9cde05e0ee6e908183d /Gemfile
parent43f474901db9ca4192940af38519befb91c6f241 (diff)
parent366ebe8b13ec0b92cfef7a2317b6003577e323bf (diff)
downloadgitlab-ce-424c46731018f0232e2b6341f474100cb185c05a.tar.gz
Merge branch 'rs-update-capybara' into 'master'
Update capybara 2.6.2 -> 2.15.1 See merge request !13976
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index 0341f2609ad..2ebc01d8a15 100644
--- a/Gemfile
+++ b/Gemfile
@@ -324,7 +324,7 @@ group :development, :test do
# Generate Fake data
gem 'ffaker', '~> 2.4'
- gem 'capybara', '~> 2.6.2'
+ gem 'capybara', '~> 2.15.0'
gem 'capybara-screenshot', '~> 1.0.0'
gem 'poltergeist', '~> 1.9.0'