diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-01-02 16:32:28 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-01-02 16:32:28 +0000 |
| commit | e84b60f414b59bb3ee9d08752db368b51e605c41 (patch) | |
| tree | 18b3a4187530a2e0b7329e6e330da82ab7456ae2 | |
| parent | 5f5ac346b4f83abfcadd1763ce03b3c945594763 (diff) | |
| parent | 51b416338a2ee9e287787850d11a3474e16f1474 (diff) | |
| download | gitlab-ce-e84b60f414b59bb3ee9d08752db368b51e605c41.tar.gz | |
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
| -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) |