diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-12-10 19:22:53 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-12-10 19:22:53 +0300 |
| commit | eadd53b969da2704d7551069eda0b416ffb7b0e2 (patch) | |
| tree | f182d6099394aefad97d510c681ceba73ce2c3be /lib | |
| parent | cd82c38916915d96a4de8c7f7f269c43454d9a75 (diff) | |
| parent | e96fd232a628e9f5f008936b5db645412e33cfef (diff) | |
Merge branch 'sh-remove-gitlab-shell-include' into 'master'
Remove unnecessary includes of ShellAdapter
See merge request gitlab-org/gitlab-ce!23607
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/bitbucket_server_import/importer.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/import_export/repo_restorer.rb | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/lib/gitlab/bitbucket_server_import/importer.rb b/lib/gitlab/bitbucket_server_import/importer.rb index d4080536d81..28cfb46e2d4 100644 --- a/lib/gitlab/bitbucket_server_import/importer.rb +++ b/lib/gitlab/bitbucket_server_import/importer.rb @@ -3,8 +3,6 @@ module Gitlab module BitbucketServerImport class Importer - include Gitlab::ShellAdapter - attr_reader :recover_missing_commits attr_reader :project, :project_key, :repository_slug, :client, :errors, :users attr_accessor :logger diff --git a/lib/gitlab/import_export/repo_restorer.rb b/lib/gitlab/import_export/repo_restorer.rb index 921a06b4023..91167a9c4fb 100644 --- a/lib/gitlab/import_export/repo_restorer.rb +++ b/lib/gitlab/import_export/repo_restorer.rb @@ -4,7 +4,6 @@ module Gitlab module ImportExport class RepoRestorer include Gitlab::ImportExport::CommandLineUtil - include Gitlab::ShellAdapter def initialize(project:, shared:, path_to_bundle:) @project = project |