diff options
author | Robert Speicher <robert@gitlab.com> | 2016-08-12 18:04:03 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2016-08-12 18:04:03 +0000 |
commit | 11eefba891f214eefc1efa334adbcc9e979c0ce3 (patch) | |
tree | 69dc1a835658ba03d05264aee00207e67c178658 /spec/requests | |
parent | 7b63f8289c5e9a811215a3b26ccd5e0e793a9653 (diff) | |
parent | cb8a425ba42e9be23b8712ed29b1db2dcc6bd139 (diff) | |
download | gitlab-ce-11eefba891f214eefc1efa334adbcc9e979c0ce3.tar.gz |
Merge branch 'fix-namespace-deletion' into 'master'
Fix bug where destroying a namespace would not always destroy projects
There is a race condition in DestroyGroupService now that projects are deleted asynchronously:
1. User attempts to delete group
2. DestroyGroupService iterates through all projects and schedules a Sidekiq job to delete each Project
3. DestroyGroupService destroys the Group, leaving all its projects without a namespace
4. Projects::DestroyService runs later but the can?(current_user,
:remove_project) is `false` because the user no longer has permission to
destroy projects with no namespace.
5. This leaves the project in pending_delete state with no namespace/group.
Projects without a namespace or group also adds another problem: it's not possible to destroy the container registry tags, since `container_registry_path_with_namespace` is the wrong value.
The fix is to destroy the group asynchronously and run `execute` directly on Projects::DestroyService.
Closes #17893
See merge request !4341
Diffstat (limited to 'spec/requests')
-rw-r--r-- | spec/requests/api/users_spec.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/spec/requests/api/users_spec.rb b/spec/requests/api/users_spec.rb index e0e041b4e15..0bbba64a6d5 100644 --- a/spec/requests/api/users_spec.rb +++ b/spec/requests/api/users_spec.rb @@ -564,12 +564,14 @@ describe API::API, api: true do end describe "DELETE /users/:id" do + let!(:namespace) { user.namespace } before { admin } it "deletes user" do delete api("/users/#{user.id}", admin) expect(response).to have_http_status(200) expect { User.find(user.id) }.to raise_error ActiveRecord::RecordNotFound + expect { Namespace.find(namespace.id) }.to raise_error ActiveRecord::RecordNotFound expect(json_response['email']).to eq(user.email) end |