diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-04-12 14:05:47 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-04-12 14:05:47 +0000 |
| commit | d697c1d836bf7bfa11c677a5cde12a95354aba2d (patch) | |
| tree | 8887da3f74754666edf9e4462742dd59ce9e8e79 /Gemfile.lock | |
| parent | d6808837d2d4814a1c97169b7c0035b9e71b53d9 (diff) | |
| parent | d568c8df180d7cb45f53598eb1111061ecd1c556 (diff) | |
| download | gitlab-ce-d697c1d836bf7bfa11c677a5cde12a95354aba2d.tar.gz | |
Merge branch 'update-capybara' into 'master'
Update capybara and selenium-webdriver
See merge request gitlab-org/gitlab-ce!27201
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index baa7be6258a..c1d1a50799f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -100,13 +100,13 @@ GEM bundler (~> 1.2) thor (~> 0.18) byebug (9.1.0) - capybara (2.16.1) + capybara (2.18.0) addressable mini_mime (>= 0.1.3) nokogiri (>= 1.3.3) rack (>= 1.0.0) rack-test (>= 0.5.4) - xpath (~> 2.0) + xpath (>= 2.0, < 4.0) capybara-screenshot (1.0.22) capybara (>= 1.0, < 4) launchy @@ -488,7 +488,7 @@ GEM net-ssh (5.0.1) netrc (0.11.0) nio4r (2.3.1) - nokogiri (1.10.1) + nokogiri (1.10.2) mini_portile2 (~> 2.4.0) nokogumbo (1.5.0) nokogiri @@ -706,7 +706,7 @@ GEM redis-store (>= 1.2, < 2) redis-store (1.6.0) redis (>= 2.2, < 5) - regexp_parser (1.3.0) + regexp_parser (1.4.0) regexp_property_values (0.3.4) representable (3.0.4) declarative (< 0.1.0) @@ -815,9 +815,9 @@ GEM seed-fu (2.3.7) activerecord (>= 3.1) activesupport (>= 3.1) - selenium-webdriver (3.12.0) + selenium-webdriver (3.141.0) childprocess (~> 0.5) - rubyzip (~> 1.2) + rubyzip (~> 1.2, >= 1.2.2) sentry-raven (2.9.0) faraday (>= 0.7.6, < 1.0) settingslogic (2.0.9) @@ -943,8 +943,8 @@ GEM rinku with_env (1.1.0) xml-simple (1.1.5) - xpath (2.1.0) - nokogiri (~> 1.3) + xpath (3.2.0) + nokogiri (~> 1.8) PLATFORMS ruby @@ -974,8 +974,8 @@ DEPENDENCIES browser (~> 2.5) bullet (~> 5.5.0) bundler-audit (~> 0.5.0) - capybara (~> 2.16.1) - capybara-screenshot (~> 1.0.18) + capybara (~> 2.18.0) + capybara-screenshot (~> 1.0.22) carrierwave (~> 1.3) charlock_holmes (~> 0.7.5) chronic (~> 0.10.2) @@ -1146,7 +1146,7 @@ DEPENDENCIES sass-rails (~> 5.0.6) scss_lint (~> 0.56.0) seed-fu (~> 2.3.7) - selenium-webdriver (~> 3.12) + selenium-webdriver (~> 3.141) sentry-raven (~> 2.7) settingslogic (~> 2.0.9) sham_rack (~> 1.3.6) |