GitLab steht wegen Wartungsarbeiten am Montag, den 10. Mai, zwischen 17:00 und 19:00 Uhr nicht zur Verfügung.

Commit b221d11a authored by Zeger-Jan van de Weg's avatar Zeger-Jan van de Weg

Add ability to delete a user with force

parent 4bcc0977
......@@ -59,6 +59,7 @@ v 8.5.3
- Show commit message in JIRA mention comment
- Makes issue page and merge request page usable on mobile browsers.
- Improved UI for profile settings
- User deletion is now done in the background so the request can not time out
v 8.5.2
- Fix sidebar overlapping content when screen width was below 1200px
......@@ -178,7 +179,6 @@ v 8.5.0
v 8.4.5
- No CE-specific changes
- User deletion is now done in the background so the request can not time out
v 8.4.4
- Update omniauth-saml gem to 1.4.2
......
......@@ -119,7 +119,7 @@ def update
end
def destroy
DeleteUserService.new(current_user).execute(user)
DeleteUserWorker.perform_async(current_user.id, user.id)
respond_to do |format|
format.html { redirect_to admin_users_path, notice: "The user is being deleted." }
......
......@@ -19,9 +19,9 @@ class AbuseReport < ActiveRecord::Base
validates :message, presence: true
validates :user_id, uniqueness: { message: 'has already been reported' }
def remove_user
def remove_user(current_user)
user.block
user.destroy
DeleteUserWorker.perform_async(current_user.id, user.id, force: true)
end
def notify
......
......@@ -5,18 +5,22 @@ def initialize(current_user)
@current_user = current_user
end
def execute(user)
if user.solo_owned_groups.present?
def execute(user, options = {})
if !options[:force] && user.solo_owned_groups.present?
user.errors[:base] << 'You must transfer ownership or delete groups before you can remove user'
user
else
user.personal_projects.each do |project|
# Skip repository removal because we remove directory with namespace
# that contain all this repositories
::Projects::DestroyService.new(project, current_user, skip_repo: true).pending_delete!
end
return user
end
user.solo_owned_groups.each do |group|
DeleteGroupService.new(group, current_user).execute
end
user.destroy
user.personal_projects.each do |project|
# Skip repository removal because we remove directory with namespace
# that contain all this repositories
::Projects::DestroyService.new(project, current_user, skip_repo: true).pending_delete!
end
user.destroy
end
end
......@@ -6,12 +6,12 @@ def initialize(group, user)
end
def execute
@group.projects.each do |project|
group.projects.each do |project|
# Skip repository removal because we remove directory with namespace
# that contain all this repositories
::Projects::DestroyService.new(project, current_user, skip_repo: true).pending_delete!
end
@group.destroy
group.destroy
end
end
class DeleteUserWorker
include Sidekiq::Worker
def perform(current_user_id, delete_user_id)
def perform(current_user_id, delete_user_id, options = {})
delete_user = User.find(delete_user_id)
current_user = User.find(current_user_id)
DeleteUserService.new(current_user).execute(delete_user)
DeleteUserService.new(current_user).execute(delete_user, options.symbolize_keys)
end
end
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment