diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-04 18:10:20 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-04 18:10:20 +0000 |
| commit | 9bbcab8301ed38576debcb6a7f07f99005ff805a (patch) | |
| tree | 20e348b90c8fc27db66a68d6a87546448590f31b /Gemfile.lock | |
| parent | 39a548dd06b8ddcc0d2acb7832460f5fe1876521 (diff) | |
| download | gitlab-ce-9bbcab8301ed38576debcb6a7f07f99005ff805a.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
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 eb1a0eb5a27..edd8b9c73c5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -653,7 +653,7 @@ GEM nenv (0.3.0) net-ldap (0.16.2) net-ntp (2.1.3) - net-ssh (5.2.0) + net-ssh (6.0.0) netrc (0.11.0) nio4r (2.5.2) no_proxy_fix (0.1.2) @@ -1301,7 +1301,7 @@ DEPENDENCIES nakayoshi_fork (~> 0.0.4) net-ldap net-ntp - net-ssh (~> 5.2) + net-ssh (~> 6.0) nokogiri (~> 1.10.9) oauth2 (~> 1.4) octokit (~> 4.15) |