summaryrefslogtreecommitdiff
path: root/qa/Gemfile.lock
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzegorz@gitlab.com>2018-01-25 12:01:28 +0000
committerGrzegorz Bizon <grzegorz@gitlab.com>2018-01-25 12:01:28 +0000
commit7ea8ea8e1a214bf622b27867300ffb25887d2b7f (patch)
tree38c7d3bc17109dcbd5e499cfadecaf917a231be5 /qa/Gemfile.lock
parent60f372859d0771d7a6f484d64649e9f250699225 (diff)
parent5e911c5d2c18b5f909f2072cc97bb75704496ea1 (diff)
downloadgitlab-ce-7ea8ea8e1a214bf622b27867300ffb25887d2b7f.tar.gz
Merge branch 'qa-deploy-key-scenario' into 'master'
Generate ssh key on the fly for QA See merge request gitlab-org/gitlab-ce!16562
Diffstat (limited to 'qa/Gemfile.lock')
-rw-r--r--qa/Gemfile.lock2
1 files changed, 2 insertions, 0 deletions
diff --git a/qa/Gemfile.lock b/qa/Gemfile.lock
index 565adac7499..51d2e4d7a10 100644
--- a/qa/Gemfile.lock
+++ b/qa/Gemfile.lock
@@ -46,6 +46,7 @@ GEM
mini_mime (1.0.0)
mini_portile2 (2.3.0)
minitest (5.11.1)
+ net-ssh (4.1.0)
netrc (0.11.0)
nokogiri (1.8.1)
mini_portile2 (~> 2.3.0)
@@ -97,6 +98,7 @@ DEPENDENCIES
airborne (~> 0.2.13)
capybara (~> 2.16.1)
capybara-screenshot (~> 1.0.18)
+ net-ssh
pry-byebug (~> 3.5.1)
rake (~> 12.3.0)
rspec (~> 3.7)