diff options
author | Shinya Maeda <shinya@gitlab.com> | 2017-12-05 02:37:52 +0900 |
---|---|---|
committer | Shinya Maeda <shinya@gitlab.com> | 2017-12-05 02:37:52 +0900 |
commit | 216173d18fd19e13503f145da3ef74f1a7da7b8b (patch) | |
tree | 3d53aa775b6b797371d8e7aeff1e35a349ddebf7 /lib/gitlab/shell.rb | |
parent | 346dcb0626a68ddb1432588e01f78da913cfd827 (diff) | |
parent | 8f9622bb5ab96bf21798ae1b960b3c969db15e5d (diff) | |
download | gitlab-ce-216173d18fd19e13503f145da3ef74f1a7da7b8b.tar.gz |
Merge branch 'master' into 35616-move-k8-to-cluster-page
Diffstat (limited to 'lib/gitlab/shell.rb')
-rw-r--r-- | lib/gitlab/shell.rb | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/lib/gitlab/shell.rb b/lib/gitlab/shell.rb index 996d213fdb4..a22a63665be 100644 --- a/lib/gitlab/shell.rb +++ b/lib/gitlab/shell.rb @@ -143,20 +143,27 @@ module Gitlab storage, "#{path}.git", "#{new_path}.git"]) end - # Fork repository to new namespace + # Fork repository to new path # forked_from_storage - forked-from project's storage path - # path - project path with namespace + # forked_from_disk_path - project disk path # forked_to_storage - forked-to project's storage path - # fork_namespace - namespace for forked project + # forked_to_disk_path - forked project disk path # # Ex. - # fork_repository("/path/to/forked_from/storage", "gitlab/gitlab-ci", "/path/to/forked_to/storage", "randx") + # fork_repository("/path/to/forked_from/storage", "gitlab/gitlab-ci", "/path/to/forked_to/storage", "new-namespace/gitlab-ci") # # Gitaly note: JV: not easy to migrate because this involves two Gitaly servers, not one. - def fork_repository(forked_from_storage, path, forked_to_storage, fork_namespace) - gitlab_shell_fast_execute([gitlab_shell_projects_path, 'fork-project', - forked_from_storage, "#{path}.git", forked_to_storage, - fork_namespace]) + def fork_repository(forked_from_storage, forked_from_disk_path, forked_to_storage, forked_to_disk_path) + gitlab_shell_fast_execute( + [ + gitlab_shell_projects_path, + 'fork-repository', + forked_from_storage, + "#{forked_from_disk_path}.git", + forked_to_storage, + "#{forked_to_disk_path}.git" + ] + ) end # Remove repository from file system |