diff options
author | Matija Čupić <matteeyah@gmail.com> | 2018-01-28 19:24:15 +0100 |
---|---|---|
committer | Matija Čupić <matteeyah@gmail.com> | 2018-01-28 19:24:15 +0100 |
commit | 6fb59ffb97cee2df2febf306bb1f835275557f23 (patch) | |
tree | 7b941b6415058f9dfa8571dd8b0bb3461b955fff /app/models/project.rb | |
parent | 62b7c3ba4aa1a354ac5380400c707a381ef0e5e4 (diff) | |
parent | dc325c672e20afa953117b0e1b04b2e399f391d7 (diff) | |
download | gitlab-ce-6fb59ffb97cee2df2febf306bb1f835275557f23.tar.gz |
Merge branch 'master' into 38175-add-domain-field-to-auto-devops-application-setting
Diffstat (limited to 'app/models/project.rb')
-rw-r--r-- | app/models/project.rb | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index 97f5e678021..cbcf8b80e8e 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -568,6 +568,9 @@ class Project < ActiveRecord::Base RepositoryForkWorker.perform_async(id, forked_from_project.repository_storage_path, forked_from_project.disk_path) + elsif gitlab_project_import? + # Do not retry on Import/Export until https://gitlab.com/gitlab-org/gitlab-ce/issues/26189 is solved. + RepositoryImportWorker.set(retry: false).perform_async(self.id) else RepositoryImportWorker.perform_async(self.id) end @@ -971,9 +974,9 @@ class Project < ActiveRecord::Base hooks.hooks_for(hooks_scope).each do |hook| hook.async_execute(data, hooks_scope.to_s) end - end - SystemHooksService.new.execute_hooks(data, hooks_scope) + SystemHooksService.new.execute_hooks(data, hooks_scope) + end end def execute_services(data, hooks_scope = :push_hooks) @@ -1032,6 +1035,8 @@ class Project < ActiveRecord::Base end def fork_source + return nil unless forked? + forked_from_project || fork_network&.root_project end |