diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-07-11 16:49:26 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-07-11 16:49:26 +0000 |
| commit | 7a938e67c4ea3464d1d2603cab382e0ce3ab9d56 (patch) | |
| tree | 187f616cc5bfe99db01ae3d42177c0b8d57f2252 | |
| parent | 0ef9fab122cb8568c03035e8b90849728edec8c6 (diff) | |
| parent | 605a5170108923dcea75f7aec8224b25f03d9fe2 (diff) | |
| download | gitlab-ce-7a938e67c4ea3464d1d2603cab382e0ce3ab9d56.tar.gz | |
Merge branch '34867-remove-net-ssh-gem' into 'master'
Remove net-ssh gem
Closes #34867
See merge request !12736
| -rw-r--r-- | Gemfile | 1 | ||||
| -rw-r--r-- | Gemfile.lock | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/34867-remove-net-ssh-gem.yml | 4 |
3 files changed, 4 insertions, 3 deletions
@@ -250,7 +250,6 @@ gem 'jquery-rails', '~> 4.1.0' gem 'request_store', '~> 1.3' gem 'select2-rails', '~> 3.5.9' gem 'virtus', '~> 1.0.1' -gem 'net-ssh', '~> 3.0.1' gem 'base32', '~> 0.3.0' # Sentry integration diff --git a/Gemfile.lock b/Gemfile.lock index 085ae9fe63e..bb5b3602add 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -472,7 +472,6 @@ GEM mustermann (= 0.4.0) mysql2 (0.3.20) net-ldap (0.12.1) - net-ssh (3.0.1) netrc (0.11.0) nokogiri (1.6.8.1) mini_portile2 (~> 2.1.0) @@ -1013,7 +1012,6 @@ DEPENDENCIES minitest (~> 5.7.0) mousetrap-rails (~> 1.4.6) mysql2 (~> 0.3.16) - net-ssh (~> 3.0.1) nokogiri (~> 1.6.7, >= 1.6.7.2) oauth2 (~> 1.4) octokit (~> 4.6.2) diff --git a/changelogs/unreleased/34867-remove-net-ssh-gem.yml b/changelogs/unreleased/34867-remove-net-ssh-gem.yml new file mode 100644 index 00000000000..f5648d62467 --- /dev/null +++ b/changelogs/unreleased/34867-remove-net-ssh-gem.yml @@ -0,0 +1,4 @@ +--- +title: Remove net-ssh gem +merge_request: +author: Takuya Noguchi |