diff options
| author | James Lopez <james@jameslopez.es> | 2018-01-02 18:48:46 +0300 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2018-01-02 18:48:46 +0300 |
| commit | 11d0083e95b9dc22c27f368e38058ec3e0a40f46 (patch) | |
| tree | 616f03c012841e8edf490aa7db10dc3dc13381a2 | |
| parent | 3faa988eb8a3098d05045c554ff7540fa5ab29bf (diff) | |
fix missing create services call
| -rw-r--r-- | app/services/projects/create_service.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/bare_repository_import/importer.rb | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/app/services/projects/create_service.rb b/app/services/projects/create_service.rb index 6dd51cc2bef..4ed65982326 100644 --- a/app/services/projects/create_service.rb +++ b/app/services/projects/create_service.rb @@ -88,7 +88,7 @@ module Projects def after_create_actions log_info("#{@project.owner.name} created a new project \"#{@project.name_with_namespace}\"") - unless @project.gitlab_project_import? + if !@project.gitlab_project_import? || @skip_import @project.create_wiki unless skip_wiki? create_services_from_active_templates(@project) diff --git a/lib/gitlab/bare_repository_import/importer.rb b/lib/gitlab/bare_repository_import/importer.rb index 3fa2a7e8dfe..b0b349088d9 100644 --- a/lib/gitlab/bare_repository_import/importer.rb +++ b/lib/gitlab/bare_repository_import/importer.rb @@ -77,8 +77,6 @@ module Gitlab if bare_repo.wiki_exists? FileUtils.mv(wiki_path, File.join(project.repository_storage_path, project.disk_path + '.wiki.git')) - else - project.create_wiki end true |