summaryrefslogtreecommitdiff
path: root/lib/api/members.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-01-14 21:07:45 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-01-14 21:07:45 +0000
commit0b12a5312c9701fbfed25fbb334d47900ced736b (patch)
treea29a27e297134f573fd8e5c298d241f3156c207a /lib/api/members.rb
parent92f95ccac81911d1fcc32e999a7f1ce04624a56c (diff)
downloadgitlab-ce-0b12a5312c9701fbfed25fbb334d47900ced736b.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/api/members.rb')
-rw-r--r--lib/api/members.rb4
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