summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2017-08-31 20:47:09 -0400
committerRobert Speicher <rspeicher@gmail.com>2017-09-05 10:12:12 -0400
commitbc9550cbba76a074b76e194cc9ab5d9065a13c14 (patch)
treef9082c1155de7c23b67f82c80dcf6e2725600fc2
parentd316a8c0b39652d6053238d6a14983c51714faa0 (diff)
downloadgitlab-ce-bc9550cbba76a074b76e194cc9ab5d9065a13c14.tar.gz
Update capybara 2.6.2 -> 2.15.1
Changelog: https://git.io/v5403
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock9
2 files changed, 6 insertions, 5 deletions
diff --git a/Gemfile b/Gemfile
index 61c941ae449..7ee62874a75 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'
diff --git a/Gemfile.lock b/Gemfile.lock
index cba30e856ed..da0618ecde3 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)
@@ -478,6 +478,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)
@@ -947,7 +948,7 @@ GEM
expression_parser
rinku
xml-simple (1.1.5)
- xpath (2.0.0)
+ xpath (2.1.0)
nokogiri (~> 1.3)
PLATFORMS
@@ -978,7 +979,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)