Commit 13863d6a authored by Lin Jen-Shin's avatar Lin Jen-Shin

Merge branch 'bump_selenium_webdriver' into 'master'

Bump selenium-webdriver to 3.142

See merge request gitlab-org/gitlab!20829
parents 341dfd9c 78daae30
...@@ -401,7 +401,7 @@ group :test do ...@@ -401,7 +401,7 @@ group :test do
gem 'capybara', '~> 3.22.0' gem 'capybara', '~> 3.22.0'
gem 'capybara-screenshot', '~> 1.0.22' gem 'capybara-screenshot', '~> 1.0.22'
gem 'selenium-webdriver', '~> 3.141' gem 'selenium-webdriver', '~> 3.142'
gem 'shoulda-matchers', '~> 4.0.1', require: false gem 'shoulda-matchers', '~> 4.0.1', require: false
gem 'email_spec', '~> 2.2.0' gem 'email_spec', '~> 2.2.0'
......
...@@ -143,8 +143,7 @@ GEM ...@@ -143,8 +143,7 @@ GEM
cause (0.1) cause (0.1)
character_set (1.1.2) character_set (1.1.2)
charlock_holmes (0.7.6) charlock_holmes (0.7.6)
childprocess (0.9.0) childprocess (3.0.0)
ffi (~> 1.0, >= 1.0.11)
chunky_png (1.3.5) chunky_png (1.3.5)
citrus (3.0.2) citrus (3.0.2)
claide (1.0.3) claide (1.0.3)
...@@ -286,7 +285,7 @@ GEM ...@@ -286,7 +285,7 @@ GEM
fast_blank (1.0.0) fast_blank (1.0.0)
fast_gettext (1.6.0) fast_gettext (1.6.0)
ffaker (2.10.0) ffaker (2.10.0)
ffi (1.11.1) ffi (1.11.3)
flipper (0.17.1) flipper (0.17.1)
flipper-active_record (0.17.1) flipper-active_record (0.17.1)
activerecord (>= 4.2, < 7) activerecord (>= 4.2, < 7)
...@@ -957,9 +956,9 @@ GEM ...@@ -957,9 +956,9 @@ GEM
seed-fu (2.3.7) seed-fu (2.3.7)
activerecord (>= 3.1) activerecord (>= 3.1)
activesupport (>= 3.1) activesupport (>= 3.1)
selenium-webdriver (3.141.0) selenium-webdriver (3.142.6)
childprocess (~> 0.5) childprocess (>= 0.5, < 4.0)
rubyzip (~> 1.2, >= 1.2.2) rubyzip (>= 1.2.2)
sentry-raven (2.9.0) sentry-raven (2.9.0)
faraday (>= 0.7.6, < 1.0) faraday (>= 0.7.6, < 1.0)
settingslogic (2.0.9) settingslogic (2.0.9)
...@@ -1326,7 +1325,7 @@ DEPENDENCIES ...@@ -1326,7 +1325,7 @@ DEPENDENCIES
sassc-rails (~> 2.1.0) sassc-rails (~> 2.1.0)
scss_lint (~> 0.56.0) scss_lint (~> 0.56.0)
seed-fu (~> 2.3.7) seed-fu (~> 2.3.7)
selenium-webdriver (~> 3.141) selenium-webdriver (~> 3.142)
sentry-raven (~> 2.9) sentry-raven (~> 2.9)
settingslogic (~> 2.0.9) settingslogic (~> 2.0.9)
shoulda-matchers (~> 4.0.1) shoulda-matchers (~> 4.0.1)
......
...@@ -25,8 +25,7 @@ GEM ...@@ -25,8 +25,7 @@ GEM
capybara-screenshot (1.0.18) capybara-screenshot (1.0.18)
capybara (>= 1.0, < 3) capybara (>= 1.0, < 3)
launchy launchy
childprocess (0.9.0) childprocess (3.0.0)
ffi (~> 1.0, >= 1.0.11)
coderay (1.1.2) coderay (1.1.2)
concurrent-ruby (1.1.5) concurrent-ruby (1.1.5)
debase (0.2.4.1) debase (0.2.4.1)
...@@ -95,9 +94,9 @@ GEM ...@@ -95,9 +94,9 @@ GEM
ruby-debug-ide (0.7.0) ruby-debug-ide (0.7.0)
rake (>= 0.8.1) rake (>= 0.8.1)
rubyzip (1.2.2) rubyzip (1.2.2)
selenium-webdriver (3.141.0) selenium-webdriver (3.142.6)
childprocess (~> 0.5) childprocess (>= 0.5, < 4.0)
rubyzip (~> 1.2, >= 1.2.2) rubyzip (>= 1.2.2)
thread_safe (0.3.6) thread_safe (0.3.6)
tzinfo (1.2.5) tzinfo (1.2.5)
thread_safe (~> 0.1) thread_safe (~> 0.1)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment