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

fix spec failures

This commit is contained in:
James Lopez 2017-06-23 21:13:46 +02:00
parent efb3d5e70f
commit 859858c7e6
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/api/users.rb
View File

@ -236,7 +236,7 @@ module API
user = User.find_by(id: params.delete(:id))
not_found!('User') unless user
email = Emails::CreateService.new(current_user, user, declared_params(include_missing: false)).execute
email = Emails::CreateService.new(user,declared_params(include_missing: false)).execute
if email.errors.blank?
NotificationService.new.new_email(email)
@ -276,7 +276,7 @@ module API
email = user.emails.find_by(id: params[:email_id])
not_found!('Email') unless email
Emails::DestroyService.new(current_user, user, email: email.email).execute
Emails::DestroyService.new(user, email: email.email).execute
end
desc 'Delete a user. Available only for admins.' do
@ -488,7 +488,7 @@ module API
requires :email, type: String, desc: 'The new email'
end
post "emails" do
email = Emails::CreateService.new(current_user, current_user, declared_params).execute
email = Emails::CreateService.new(current_user, declared_params).execute
if email.errors.blank?
NotificationService.new.new_email(email)
@ -506,7 +506,7 @@ module API
email = current_user.emails.find_by(id: params[:email_id])
not_found!('Email') unless email
Emails::DestroyService.new(current_user, current_user, email: email.email).execute
Emails::DestroyService.new(current_user, email: email.email).execute
end
desc 'Get a list of user activities'