diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-08-04 00:39:20 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-08-04 00:39:20 +0000 |
| commit | 532202a5278a622de874b9dfc1c4f7fe9ddf5ce4 (patch) | |
| tree | 01c52630c9b20b42ada5fe454cb16e81a2962e32 /app | |
| parent | 8890376f0f72f713a7530bd7989e71442c69dc91 (diff) | |
| parent | 443ae8c4e6682cd66eab0a2a7ec6ef913c0d684c (diff) | |
| download | gitlab-ce-532202a5278a622de874b9dfc1c4f7fe9ddf5ce4.tar.gz | |
Merge branch 'fix-project-destroy-skip-repo' into 'master'
Fix skip_repo parameter being ignored when destroying a namespace
When destroying a namespace, the `skip_repo` parameter is supposed to prevent the repository directory from being destroyed and allow
the namespace after_destroy hook to run. If the namespace fails to be deleted for some reason, we could be left with repositories that are deleted with existing projects.
See merge request !5654
Diffstat (limited to 'app')
| -rw-r--r-- | app/workers/project_destroy_worker.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/workers/project_destroy_worker.rb b/app/workers/project_destroy_worker.rb index b51c6a266c9..3062301a9b1 100644 --- a/app/workers/project_destroy_worker.rb +++ b/app/workers/project_destroy_worker.rb @@ -12,6 +12,6 @@ class ProjectDestroyWorker user = User.find(user_id) - ::Projects::DestroyService.new(project, user, params).execute + ::Projects::DestroyService.new(project, user, params.symbolize_keys).execute end end |