diff options
author | Gabriel Mazetto <brodock@gmail.com> | 2017-08-02 03:14:44 +0200 |
---|---|---|
committer | Gabriel Mazetto <brodock@gmail.com> | 2017-08-22 06:33:20 +0200 |
commit | 950c87308aa7e9f3ae5bf84790d30d6fcb688fc8 (patch) | |
tree | 3bfe1a7ee1481be6e88d1b4b719b483d383adaa5 /app | |
parent | cdafffcf158977e39161c1ad0516d91cef66ddbc (diff) | |
download | gitlab-ce-950c87308aa7e9f3ae5bf84790d30d6fcb688fc8.tar.gz |
Move create_repository back to project model as we can use disk_path and share it
Diffstat (limited to 'app')
-rw-r--r-- | app/models/concerns/storage/legacy_project.rb | 13 | ||||
-rw-r--r-- | app/models/project.rb | 13 |
2 files changed, 13 insertions, 13 deletions
diff --git a/app/models/concerns/storage/legacy_project.rb b/app/models/concerns/storage/legacy_project.rb index 815db712285..c38042495f4 100644 --- a/app/models/concerns/storage/legacy_project.rb +++ b/app/models/concerns/storage/legacy_project.rb @@ -59,18 +59,5 @@ module Storage Gitlab::UploadsTransfer.new.rename_project(path_was, path, namespace.full_path) Gitlab::PagesTransfer.new.rename_project(path_was, path, namespace.full_path) end - - def create_repository(force: false) - # Forked import is handled asynchronously - return if forked? && !force - - if gitlab_shell.add_repository(repository_storage_path, path_with_namespace) - repository.after_create - true - else - errors.add(:base, 'Failed to create repository via gitlab-shell') - false - end - end end end diff --git a/app/models/project.rb b/app/models/project.rb index ba5fca75729..570955e81dd 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -993,6 +993,19 @@ class Project < ActiveRecord::Base end end + def create_repository(force: false) + # Forked import is handled asynchronously + return if forked? && !force + + if gitlab_shell.add_repository(repository_storage_path, disk_path) + repository.after_create + true + else + errors.add(:base, 'Failed to create repository via gitlab-shell') + false + end + end + def hook_attrs(backward: true) attrs = { name: name, |