diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2017-08-29 21:09:27 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-08-29 21:09:27 +0800 |
| commit | 110d7fb78c0edf2e18c70ff3d9b60671f6935977 (patch) | |
| tree | d05720cfd55e3b91e067aaeca5731572e5853e4e /app/workers/namespaceless_project_destroy_worker.rb | |
| parent | 00b440443808fba04fc55f7e77c61f79e29c21ea (diff) | |
| parent | 01785533a5ba26e9dbed7972d9732a9b122ff3e0 (diff) | |
| download | gitlab-ce-110d7fb78c0edf2e18c70ff3d9b60671f6935977.tar.gz | |
Merge remote-tracking branch 'upstream/master' into perf.slow-issuable
* upstream/master: (206 commits)
Resolve "Monitoring graph date formatting is wrong"
Add styles for shorter code
Update doc for dind using overlay2
Cleans merge_jid when possible on MergeService
Rename MergeRequest#async_merge to merge_async
Add changelog
Track enqueued and ongoing MRs
Remove locked? check when unlocking a merge request
Update CHANGELOG.md for 9.5.2
Update rubocop-gitlab-security to 0.1.0
Fix spec
Fix changelog
Fix spec
Add changelog
Remove trigger_request.trigger.owner
Reproduced bug
Fix a transient failure in mini_pipeline_graph_spec
fix typo
fix spec
Fix events error importing GitLab projects
...
Diffstat (limited to 'app/workers/namespaceless_project_destroy_worker.rb')
| -rw-r--r-- | app/workers/namespaceless_project_destroy_worker.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/workers/namespaceless_project_destroy_worker.rb b/app/workers/namespaceless_project_destroy_worker.rb index a9073742ff7..f1cd1769421 100644 --- a/app/workers/namespaceless_project_destroy_worker.rb +++ b/app/workers/namespaceless_project_destroy_worker.rb @@ -7,6 +7,7 @@ class NamespacelessProjectDestroyWorker include Sidekiq::Worker include DedicatedSidekiqQueue + include ExceptionBacktrace def self.bulk_perform_async(args_list) Sidekiq::Client.push_bulk('class' => self, 'queue' => sidekiq_options['queue'], 'args' => args_list) @@ -18,7 +19,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 |