diff options
author | Robert Schilling <rschilling@student.tugraz.at> | 2017-02-20 19:18:12 +0100 |
---|---|---|
committer | Robert Schilling <rschilling@student.tugraz.at> | 2017-02-28 08:32:38 +0100 |
commit | 86c58687b22f788ad7c821af55abece2f9d89d50 (patch) | |
tree | eb07659dee80d897170fc4965a124251a22a913a /lib/api/members.rb | |
parent | 7733f285aca97d444382a59eda0ea3e303539c26 (diff) | |
download | gitlab-ce-86c58687b22f788ad7c821af55abece2f9d89d50.tar.gz |
Return 204 for delete endpoints
Diffstat (limited to 'lib/api/members.rb')
-rw-r--r-- | lib/api/members.rb | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/lib/api/members.rb b/lib/api/members.rb index 5f6913d1a27..baf85e6075a 100644 --- a/lib/api/members.rb +++ b/lib/api/members.rb @@ -93,24 +93,10 @@ module API end delete ":id/members/:user_id" do source = find_source(source_type, params[:id]) + # Ensure that memeber exists + source.members.find_by!(user_id: params[:user_id]) - # This is to ensure back-compatibility but find_by! should be used - # in that casse in 9.0! - member = source.members.find_by(user_id: params[:user_id]) - - # This is to ensure back-compatibility but this should be removed in - # favor of find_by! in 9.0! - not_found!("Member: user_id:#{params[:user_id]}") if source_type == 'group' && member.nil? - - # This is to ensure back-compatibility but 204 behavior should be used - # for all DELETE endpoints in 9.0! - if member.nil? - { message: "Access revoked", id: params[:user_id].to_i } - else - ::Members::DestroyService.new(source, current_user, declared_params).execute - - present member.user, with: Entities::Member, member: member - end + ::Members::DestroyService.new(source, current_user, declared_params).execute end end end |