Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorJames Lopez <james@jameslopez.es>2017-06-19 16:35:44 +0300
committerJames Lopez <james@jameslopez.es>2017-06-23 12:41:42 +0300
commit831b2fccf9a2efc772d62c05f52c612f23a63ea9 (patch)
treec36fd08364a01f2ba713f8df5aa3dd1c69314220 /app
parent87bf08c96cf9f3c451d0746d11ceac149adf22db (diff)
update missing email actions
Diffstat (limited to 'app')
-rw-r--r--app/controllers/profiles/emails_controller.rb2
-rw-r--r--app/models/user.rb2
-rw-r--r--app/services/emails/create_service.rb2
3 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/profiles/emails_controller.rb b/app/controllers/profiles/emails_controller.rb
index 9159c217f1b..40b43278439 100644
--- a/app/controllers/profiles/emails_controller.rb
+++ b/app/controllers/profiles/emails_controller.rb
@@ -7,7 +7,7 @@ class Profiles::EmailsController < Profiles::ApplicationController
def create
@email = current_user.emails.new(email_params)
- if @email.save
+ if Emails::CreateService.new(current_user, current_user, email_params).execute
NotificationService.new.new_email(@email)
else
flash[:alert] = @email.errors.full_messages.first
diff --git a/app/models/user.rb b/app/models/user.rb
index bc754768ab1..6ca78278db8 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -495,7 +495,7 @@ class User < ActiveRecord::Base
primary_email_record = emails.find_by(email: email)
if primary_email_record
Emails::DestroyService.new(self, self, email: email).execute
- emails.create(email: email_was)
+ Emails::CreateService.new(self, self, email: email_was).execute
update_secondary_emails!
end
diff --git a/app/services/emails/create_service.rb b/app/services/emails/create_service.rb
index 95e226ec710..ea65b82e418 100644
--- a/app/services/emails/create_service.rb
+++ b/app/services/emails/create_service.rb
@@ -3,7 +3,7 @@ module Emails
def execute(skip_authorization: false)
raise Gitlab::Access::AccessDeniedError unless skip_authorization || can_manage_emails?
- @user.emails.create!(email: @email)
+ @user.emails.create(email: @email)
end
end
end