diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-03-14 11:23:53 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-03-14 11:23:53 +0000 |
| commit | 9673458edc607b75662a2e53b14de5fe40012fdd (patch) | |
| tree | 7e3ad1b2e16defdcb6f2559c147f373403761fc4 /app | |
| parent | 937a99a4949bb550271f26eab53b4f95b3e0a28c (diff) | |
| parent | 7d02292a447b815074b0844e8a69593e5f859fc2 (diff) | |
| download | gitlab-ce-9673458edc607b75662a2e53b14de5fe40012fdd.tar.gz | |
Merge branch 'zj-create-repo-opt-out' into 'master'
Move CreateRepository to OPT_OUT for Gitaly
See merge request gitlab-org/gitlab-ce!17740
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/project.rb | 2 | ||||
| -rw-r--r-- | app/models/project_wiki.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index 5f9d9785d64..0183e3d0a38 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -1083,7 +1083,7 @@ class Project < ActiveRecord::Base # Forked import is handled asynchronously return if forked? && !force - if gitlab_shell.add_repository(repository_storage, disk_path) + if gitlab_shell.create_repository(repository_storage, disk_path) repository.after_create true else diff --git a/app/models/project_wiki.rb b/app/models/project_wiki.rb index f6041da986c..52e067cb44c 100644 --- a/app/models/project_wiki.rb +++ b/app/models/project_wiki.rb @@ -169,7 +169,7 @@ class ProjectWiki private def create_repo!(raw_repository) - gitlab_shell.add_repository(project.repository_storage, disk_path) + gitlab_shell.create_repository(project.repository_storage, disk_path) raise CouldNotCreateWikiError unless raw_repository.exists? |