diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-15 00:07:45 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-15 00:07:45 +0300 |
commit | 0b12a5312c9701fbfed25fbb334d47900ced736b (patch) | |
tree | a29a27e297134f573fd8e5c298d241f3156c207a /lib/api/members.rb | |
parent | 92f95ccac81911d1fcc32e999a7f1ce04624a56c (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/api/members.rb')
-rw-r--r-- | lib/api/members.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/api/members.rb b/lib/api/members.rb index e745bd0d4a9..e4df2f341c6 100644 --- a/lib/api/members.rb +++ b/lib/api/members.rb @@ -101,12 +101,12 @@ module API user = User.find_by_id(params[:user_id]) not_found!('User') unless user - member = source.add_user(user, params[:access_level], current_user: current_user, expires_at: params[:expires_at]) + member = create_member(current_user, user, source, params) if !member not_allowed! # This currently can only be reached in EE elsif member.persisted? && member.valid? - present_members member + present_members(member) else render_validation_error!(member) end |