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

fix spec failures

Browse source
This commit is contained in:
James Lopez 2017-06-22 15:55:05 +02:00
parent 0ee002c70e
commit 12dc3992ea
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/api/users.rb
View file

@ -236,7 +236,9 @@ module API
user = User.find_by(id: params.delete(:id))
not_found!('User') unless user
if Emails::CreateService.new(current_user, user, declared_params(include_missing: false)).execute(skip_authorization: true)
email = Emails::CreateService.new(current_user, user, declared_params(include_missing: false)).execute
if email.errors.blank?
NotificationService.new.new_email(email)
present email, with: Entities::Email
else
@ -274,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(skip_authorization: true)
Emails::DestroyService.new(current_user, user, email: email.email).execute
end
desc 'Delete a user. Available only for admins.' do
@ -486,9 +488,9 @@ module API
requires :email, type: String, desc: 'The new email'
end
post "emails" do
email = current_user.emails.new(declared_params)
email = Emails::CreateService.new(current_user, current_user, declared_params).execute
if Emails::CreateService.new(current_user, current_user, declared_params).execute
if email.errors.blank?
NotificationService.new.new_email(email)
present email, with: Entities::Email
else