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
diff options
context:
space:
mode:
authorBrett Walker <brett@digitalmoksha.com>2017-09-13 16:02:27 +0300
committerBrett Walker <brett@digitalmoksha.com>2017-09-23 16:24:53 +0300
commit85d2bf778a72f82b10f4bb6ebddc3cedf8ce4e4e (patch)
treea9de7ecc0d7580f447f91cf325ae9887dd43e374 /app/services/emails
parentb2d53791614da093a32fd7040371cf2054aa9817 (diff)
when a primary email is replaced and added to the secondary emails list,
make sure it stays confirmed
Diffstat (limited to 'app/services/emails')
-rw-r--r--app/services/emails/create_service.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/services/emails/create_service.rb b/app/services/emails/create_service.rb
index b6491ee9804..051efd2b2c0 100644
--- a/app/services/emails/create_service.rb
+++ b/app/services/emails/create_service.rb
@@ -1,7 +1,7 @@
module Emails
class CreateService < ::Emails::BaseService
- def execute
- @user.emails.create(email: @email)
+ def execute(options = {})
+ @user.emails.create({email: @email}.merge(options))
end
end
end