From 4f05a630951858cc2b7dafada27f3dcf87ba29bd Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 28 Nov 2019 18:06:11 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- qa/Gemfile.lock | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'qa/Gemfile.lock') diff --git a/qa/Gemfile.lock b/qa/Gemfile.lock index 84eab990c95..91b2afb6927 100644 --- a/qa/Gemfile.lock +++ b/qa/Gemfile.lock @@ -25,8 +25,7 @@ GEM capybara-screenshot (1.0.18) capybara (>= 1.0, < 3) launchy - childprocess (0.9.0) - ffi (~> 1.0, >= 1.0.11) + childprocess (3.0.0) coderay (1.1.2) concurrent-ruby (1.1.5) debase (0.2.4.1) @@ -95,9 +94,9 @@ GEM ruby-debug-ide (0.7.0) rake (>= 0.8.1) rubyzip (1.2.2) - selenium-webdriver (3.141.0) - childprocess (~> 0.5) - rubyzip (~> 1.2, >= 1.2.2) + selenium-webdriver (3.142.6) + childprocess (>= 0.5, < 4.0) + rubyzip (>= 1.2.2) thread_safe (0.3.6) tzinfo (1.2.5) thread_safe (~> 0.1) -- cgit v1.2.1