diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-03-14 18:52:16 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-03-14 18:52:16 +0000 |
| commit | 42629e08b8d27381ad4dbc8159e249a411aa20a1 (patch) | |
| tree | 9fc401180e18811c2751a9c668d5ba891ea5ab04 /Gemfile.lock | |
| parent | 2dca1bc04d82ebcf9629a51c5ea285957a5fccda (diff) | |
| parent | 7480c8afd1c6c1474c3c714a969076a05bd8b76d (diff) | |
| download | gitlab-ce-42629e08b8d27381ad4dbc8159e249a411aa20a1.tar.gz | |
Merge branch 'update-net-ssh' into 'master'
Update net-ssh 4.1.0 -> 4.2.0 (Fixes #21734)
Closes #21734
See merge request gitlab-org/gitlab-ce!17688
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 8e336803485..dbaf6a93ff8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -512,7 +512,7 @@ GEM mustermann (~> 1.0.0) mysql2 (0.4.10) net-ldap (0.16.0) - net-ssh (4.1.0) + net-ssh (4.2.0) netrc (0.11.0) nokogiri (1.8.2) mini_portile2 (~> 2.3.0) @@ -1106,7 +1106,7 @@ DEPENDENCIES mousetrap-rails (~> 1.4.6) mysql2 (~> 0.4.10) net-ldap - net-ssh (~> 4.1.0) + net-ssh (~> 4.2.0) nokogiri (~> 1.8.2) oauth2 (~> 1.4) octokit (~> 4.8) |