Commit 53e2a2de authored by Douwe Maan's avatar Douwe Maan

Merge branch 'remove-unused-gitlab-shell-code' into 'master'

Remove the unused, EE-only mv_storage gitlab_projects command

See merge request gitlab-org/gitlab-ee!3713
parents 6327b33f 077ed540
...@@ -144,20 +144,6 @@ module Gitlab ...@@ -144,20 +144,6 @@ module Gitlab
storage, "#{path}.git", "#{new_path}.git"]) storage, "#{path}.git", "#{new_path}.git"])
end end
# Move repository storage
#
# current_storage - project's current storage path
# path - project path with namespace
# new_storage - new storage path
#
# Ex.
# mv_storage("/path/to/storage", "randx/gitlab-ci", "/new/storage/path")
#
def mv_storage(current_storage, path, new_storage)
Gitlab::Utils.system_silent([gitlab_shell_projects_path, 'mv-storage',
current_storage, "#{path}.git", new_storage])
end
# Fork repository to new path # Fork repository to new path
# forked_from_storage - forked-from project's storage path # forked_from_storage - forked-from project's storage path
# forked_from_disk_path - project disk path # forked_from_disk_path - project disk path
......
...@@ -64,14 +64,6 @@ describe Gitlab::Shell do ...@@ -64,14 +64,6 @@ describe Gitlab::Shell do
end end
end end
describe '#mv_storage' do
it 'executes the command' do
expect(Gitlab::Utils).to receive(:system_silent)
.with([projects_path, 'mv-storage', 'current/storage', 'project/path.git', 'new/storage'])
gitlab_shell.mv_storage('current/storage', 'project/path', 'new/storage')
end
end
describe '#push_remote_branches' do describe '#push_remote_branches' do
let!(:args) { [projects_path, 'push-branches', 'current/storage', 'project/path.git', 'new/storage', '600', '--force', 'master'] } let!(:args) { [projects_path, 'push-branches', 'current/storage', 'project/path.git', 'new/storage', '600', '--force', 'master'] }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment