summaryrefslogtreecommitdiff
path: root/qa/Gemfile.lock
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2019-01-02 22:57:02 -0800
committerStan Hu <stanhu@gmail.com>2019-01-02 23:01:24 -0800
commit1425ee50b87a59a24602994c03e13c7004b22e4b (patch)
tree4a1e6c11e2e6bcc7b418aca9e1e12b88f64831c8 /qa/Gemfile.lock
parentbf38936fb34e18e18cb4ed81f4fb35ac9420bfd6 (diff)
downloadgitlab-ce-1425ee50b87a59a24602994c03e13c7004b22e4b.tar.gz
Update gems in Gemfile and qa/Gemfile to be consistent
This will allow developers to run `bundle install` on both directories and avoid additional calls to RubyGems for local development. Also sets up the possibility of improved caching as mentioned in https://gitlab.com/gitlab-org/gitlab-ce/issues/55843.
Diffstat (limited to 'qa/Gemfile.lock')
-rw-r--r--qa/Gemfile.lock13
1 files changed, 7 insertions, 6 deletions
diff --git a/qa/Gemfile.lock b/qa/Gemfile.lock
index d61ecf8fbb5..55f3211482b 100644
--- a/qa/Gemfile.lock
+++ b/qa/Gemfile.lock
@@ -25,7 +25,7 @@ GEM
capybara-screenshot (1.0.18)
capybara (>= 1.0, < 3)
launchy
- childprocess (0.8.0)
+ childprocess (0.9.0)
ffi (~> 1.0, >= 1.0.11)
coderay (1.1.2)
concurrent-ruby (1.0.5)
@@ -47,7 +47,7 @@ GEM
mini_portile2 (2.3.0)
minitest (5.11.1)
netrc (0.11.0)
- nokogiri (1.8.2)
+ nokogiri (1.8.5)
mini_portile2 (~> 2.3.0)
pry (0.11.3)
coderay (~> 1.1.0)
@@ -78,9 +78,9 @@ GEM
rspec-support (~> 3.7.0)
rspec-support (3.7.0)
rubyzip (1.2.2)
- selenium-webdriver (3.8.0)
+ selenium-webdriver (3.141.0)
childprocess (~> 0.5)
- rubyzip (~> 1.0)
+ rubyzip (~> 1.2, >= 1.2.2)
thread_safe (0.3.6)
tzinfo (1.2.4)
thread_safe (~> 0.1)
@@ -97,10 +97,11 @@ DEPENDENCIES
airborne (~> 0.2.13)
capybara (~> 2.16.1)
capybara-screenshot (~> 1.0.18)
+ nokogiri (~> 1.8.5)
pry-byebug (~> 3.5.1)
rake (~> 12.3.0)
rspec (~> 3.7)
- selenium-webdriver (~> 3.8.0)
+ selenium-webdriver (~> 3.12)
BUNDLED WITH
- 1.17.1
+ 1.17.3