diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-08-23 09:15:52 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-08-23 09:15:52 +0000 |
| commit | 101d52b360a6a43f1633c5dd60b78e37bc8c4339 (patch) | |
| tree | 6a169b0c93c4006dace65ad4ec4e96e0d72bdbee /app | |
| parent | 72b5d95489040649348b678c4aca1a7a0ba1d8a5 (diff) | |
| parent | d4e5ac1bed844210df089862b234ffb0ff3854f7 (diff) | |
| download | gitlab-ce-101d52b360a6a43f1633c5dd60b78e37bc8c4339.tar.gz | |
Merge branch 'tc-remove-nonexisting-namespace-pending-delete-projects' into 'master'
Add migration to remove pending delete projects with non-existing namespace
Closes #36541
See merge request !13598
Diffstat (limited to 'app')
| -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 |