diff options
author | Tiago Botelho <tiagonbotelho@hotmail.com> | 2018-01-14 11:12:43 +0000 |
---|---|---|
committer | Tiago Botelho <tiagonbotelho@hotmail.com> | 2018-01-15 16:03:25 +0000 |
commit | f17735faa5d42fae2ad4b913711c58223c3eb33f (patch) | |
tree | 2950e8a09dff4a5e5ffad0c0bf34a19086969890 /app/workers | |
parent | 74f2f9b30fb1972a26481072486b358eb943309f (diff) | |
download | gitlab-ce-f17735faa5d42fae2ad4b913711c58223c3eb33f.tar.gz |
Fork now protects default branch on completion19493-fork-does-not-protect-default-branch
Diffstat (limited to 'app/workers')
-rw-r--r-- | app/workers/repository_fork_worker.rb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/app/workers/repository_fork_worker.rb b/app/workers/repository_fork_worker.rb index d1c57b82681..07584fab7c8 100644 --- a/app/workers/repository_fork_worker.rb +++ b/app/workers/repository_fork_worker.rb @@ -17,10 +17,7 @@ class RepositoryForkWorker project.repository_storage_path, project.disk_path) raise "Unable to fork project #{project_id} for repository #{source_disk_path} -> #{project.disk_path}" unless result - project.repository.after_import - raise "Project #{project_id} had an invalid repository after fork" unless project.valid_repo? - - project.import_finish + project.after_import end private |