kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'ce-4135-remove-ee-specific-code-from-post-api-v4-projects-id-members' into 'master' 

Backport part of EE's "Remove EE-specific code from `POST /api/v4/projects/:id/members`"

See merge request gitlab-org/gitlab-ce!16051
This commit is contained in:
Robert Speicher 2018-01-02 16:32:28 +00:00
parent 5f5ac346b4 51b416338a
commit e84b60f414
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/api/members.rb
View File

@ -59,7 +59,9 @@ module API
member = source.add_user(params[:user_id], params[:access_level], current_user: current_user, expires_at: params[:expires_at])
if member.persisted? && member.valid?
if !member
not_allowed! # This currently can only be reached in EE
elsif member.persisted? && member.valid?
present member.user, with: Entities::Member, member: member
else
render_validation_error!(member)