summaryrefslogtreecommitdiff
path: root/Gemfile.lock
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.lock
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.lock')
-rw-r--r--Gemfile.lock9
1 files changed, 5 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 320d42b8974..f7ae8bddd6d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -100,9 +100,9 @@ GEM
bundler (~> 1.2)
thor (~> 0.18)
byebug (9.0.6)
- capybara (2.6.2)
+ capybara (2.15.1)
addressable
- mime-types (>= 1.16)
+ mini_mime (>= 0.1.3)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
@@ -479,6 +479,7 @@ GEM
method_source (0.8.2)
mime-types (2.99.3)
mimemagic (0.3.0)
+ mini_mime (0.1.4)
mini_portile2 (2.2.0)
minitest (5.7.0)
mmap2 (2.2.7)
@@ -948,7 +949,7 @@ GEM
expression_parser
rinku
xml-simple (1.1.5)
- xpath (2.0.0)
+ xpath (2.1.0)
nokogiri (~> 1.3)
PLATFORMS
@@ -979,7 +980,7 @@ DEPENDENCIES
browser (~> 2.2)
bullet (~> 5.5.0)
bundler-audit (~> 0.5.0)
- capybara (~> 2.6.2)
+ capybara (~> 2.15.0)
capybara-screenshot (~> 1.0.0)
carrierwave (~> 1.1)
charlock_holmes (~> 0.7.5)