diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-12-20 17:08:28 +0100 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-12-21 11:15:19 +0100 |
| commit | 51b416338a2ee9e287787850d11a3474e16f1474 (patch) | |
| tree | 3f257e3122bdc0e0a6f3b53eeb59bc0cfcb8b717 | |
| parent | b62368235b40743e5b010aa8fc6fc2058bf1effa (diff) | |
| download | gitlab-ce-ce-4135-remove-ee-specific-code-from-post-api-v4-projects-id-members.tar.gz | |
Backport a change made in EEce-4135-remove-ee-specific-code-from-post-api-v4-projects-id-members
Signed-off-by: Rémy Coutable <remy@rymai.me>
| -rw-r--r-- | lib/api/members.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/api/members.rb b/lib/api/members.rb index 22e4bdead41..5446f6b54b1 100644 --- a/lib/api/members.rb +++ b/lib/api/members.rb @@ -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) |