diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2017-08-25 12:10:53 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2017-08-25 12:10:53 +0000 |
| commit | a653c8ead4d45ffcab5447a9e38f9742600c0d09 (patch) | |
| tree | e48db5b9f0a2c1ebe9624aef0c66cfa5c18683f3 /app/workers | |
| parent | faf92651aa5e9c6bcb88acac8de27c878d7edf06 (diff) | |
| parent | 676f77269daa8a8c697bc34666bf3b00d540099b (diff) | |
| download | gitlab-ce-a653c8ead4d45ffcab5447a9e38f9742600c0d09.tar.gz | |
Merge branch 'master' into 'backstage/gb/rename-ci-cd-processing-sidekiq-queues'
# Conflicts:
# db/schema.rb
Diffstat (limited to 'app/workers')
| -rw-r--r-- | app/workers/namespaceless_project_destroy_worker.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/workers/namespaceless_project_destroy_worker.rb b/app/workers/namespaceless_project_destroy_worker.rb index a9073742ff7..1cfb0be759e 100644 --- a/app/workers/namespaceless_project_destroy_worker.rb +++ b/app/workers/namespaceless_project_destroy_worker.rb @@ -18,7 +18,8 @@ class NamespacelessProjectDestroyWorker rescue ActiveRecord::RecordNotFound return end - return unless project.namespace_id.nil? # Reject doing anything for projects that *do* have a namespace + + return if project.namespace # Reject doing anything for projects that *do* have a namespace project.team.truncate |