Add latest changes from gitlab-org/gitlab@master

8 files changed, 26 insertions, 33 deletions

diff --git a/app/mailers/emails/issues.rb b/app/mailers/emails/issues.rb
index 47d15836da0..3fd865003c1 100644
--- a/app/mailers/emails/issues.rb
+++ b/app/mailers/emails/issues.rb
@@ -85,7 +85,7 @@ module Emails
       @project = Project.find(project_id)
       @results = results
 
-      mail(to: recipient(@user.id, @project.group), subject: subject('Imported issues')) do |format|
+      mail(to: @user.notification_email_for(@project.group), subject: subject('Imported issues')) do |format|
         format.html { render layout: 'mailer' }
         format.text { render layout: 'mailer' }
       end
@@ -105,7 +105,7 @@ module Emails
     def issue_thread_options(sender_id, recipient_id, reason)
       {
         from: sender(sender_id),
-        to: recipient(recipient_id, @project.group),
+        to: User.find(recipient_id).notification_email_for(@project.group),
         subject: subject("#{@issue.title} (##{@issue.iid})"),
         'X-GitLab-NotificationReason' => reason
       }
diff --git a/app/mailers/emails/members.rb b/app/mailers/emails/members.rb
index 76fa7236ab1..ea8032324aa 100644
--- a/app/mailers/emails/members.rb
+++ b/app/mailers/emails/members.rb
@@ -13,7 +13,9 @@ module Emails
       @member_source_type = member_source_type
       @member_id = member_id
 
-      mail(to: recipient(recipient_id, notification_group),
+      user = User.find(recipient_id)
+
+      mail(to: user.notification_email_for(notification_group),
            subject: subject("Request to join the #{member_source.human_name} #{member_source.model_name.singular}"))
     end
 
@@ -21,7 +23,7 @@ module Emails
       @member_source_type = member_source_type
       @member_id = member_id
 
-      mail(to: recipient(member.user, notification_group),
+      mail(to: member.user.notification_email_for(notification_group),
            subject: subject("Access to the #{member_source.human_name} #{member_source.model_name.singular} was granted"))
     end
 
@@ -29,7 +31,9 @@ module Emails
       @member_source_type = member_source_type
       @member_source = member_source_class.find(source_id)
 
-      mail(to: recipient(user_id, notification_group),
+      user = User.find(user_id)
+
+      mail(to: user.notification_email_for(notification_group),
            subject: subject("Access to the #{member_source.human_name} #{member_source.model_name.singular} was denied"))
     end
 
@@ -47,7 +51,7 @@ module Emails
       @member_id = member_id
       return unless member.created_by
 
-      mail(to: recipient(member.created_by, notification_group),
+      mail(to: member.created_by.notification_email_for(notification_group),
            subject: subject('Invitation accepted'))
     end
 
@@ -58,7 +62,9 @@ module Emails
       @member_source = member_source_class.find(source_id)
       @invite_email = invite_email
 
-      mail(to: recipient(created_by_id, notification_group),
+      user = User.find(created_by_id)
+
+      mail(to: user.notification_email_for(notification_group),
            subject: subject('Invitation declined'))
     end
 
diff --git a/app/mailers/emails/merge_requests.rb b/app/mailers/emails/merge_requests.rb
index d972d0dea28..76b1c2d234c 100644
--- a/app/mailers/emails/merge_requests.rb
+++ b/app/mailers/emails/merge_requests.rb
@@ -110,7 +110,7 @@ module Emails
     def merge_request_thread_options(sender_id, recipient_id, reason = nil)
       {
         from: sender(sender_id),
-        to: recipient(recipient_id, @project.group),
+        to: User.find(recipient_id).notification_email_for(@project.group),
         subject: subject("#{@merge_request.title} (#{@merge_request.to_reference})"),
         'X-GitLab-NotificationReason' => reason
       }
diff --git a/app/mailers/emails/notes.rb b/app/mailers/emails/notes.rb
index 51b6368a307..a1c8c3455b5 100644
--- a/app/mailers/emails/notes.rb
+++ b/app/mailers/emails/notes.rb
@@ -55,7 +55,7 @@ module Emails
     def note_thread_options(recipient_id, reason)
       {
         from: sender(@note.author_id),
-        to: recipient(recipient_id, @project&.group || @group),
+        to: User.find(recipient_id).notification_email_for(@project&.group || @group),
         subject: subject("#{@note.noteable.title} (#{@note.noteable.reference_link_text})"),
         'X-GitLab-NotificationReason' => reason
       }
diff --git a/app/mailers/emails/pages_domains.rb b/app/mailers/emails/pages_domains.rb
index 2d390666f65..1caca6b3e44 100644
--- a/app/mailers/emails/pages_domains.rb
+++ b/app/mailers/emails/pages_domains.rb
@@ -7,7 +7,7 @@ module Emails
       @project = domain.project
 
       mail(
-        to: recipient(recipient.id, @project.group),
+        to: recipient.notification_email_for(@project.group),
         subject: subject("GitLab Pages domain '#{domain.domain}' has been enabled")
       )
     end
@@ -17,7 +17,7 @@ module Emails
       @project = domain.project
 
       mail(
-        to: recipient(recipient.id, @project.group),
+        to: recipient.notification_email_for(@project.group),
         subject: subject("GitLab Pages domain '#{domain.domain}' has been disabled")
       )
     end
@@ -27,7 +27,7 @@ module Emails
       @project = domain.project
 
       mail(
-        to: recipient(recipient.id, @project.group),
+        to: recipient.notification_email_for(@project.group),
         subject: subject("Verification succeeded for GitLab Pages domain '#{domain.domain}'")
       )
     end
@@ -37,7 +37,7 @@ module Emails
       @project = domain.project
 
       mail(
-        to: recipient(recipient.id, @project.group),
+        to: recipient.notification_email_for(@project.group),
         subject: subject("ACTION REQUIRED: Verification failed for GitLab Pages domain '#{domain.domain}'")
       )
     end
diff --git a/app/mailers/emails/projects.rb b/app/mailers/emails/projects.rb
index 4acf4a1dc4f..6274879ee99 100644
--- a/app/mailers/emails/projects.rb
+++ b/app/mailers/emails/projects.rb
@@ -7,20 +7,20 @@ module Emails
       @project = Project.find project_id
       @target_url = project_url(@project)
       @old_path_with_namespace = old_path_with_namespace
-      mail(to: recipient(user_id, @project.group),
+      mail(to: @user.notification_email_for(@project.group),
            subject: subject("Project was moved"))
     end
 
     def project_was_exported_email(current_user, project)
       @project = project
-      mail(to: recipient(current_user.id, project.group),
+      mail(to: current_user.notification_email_for(project.group),
            subject: subject("Project was exported"))
     end
 
     def project_was_not_exported_email(current_user, project, errors)
       @project = project
       @errors = errors
-      mail(to: recipient(current_user.id, @project.group),
+      mail(to: current_user.notification_email_for(@project.group),
            subject: subject("Project export error"))
     end
 
@@ -28,7 +28,7 @@ module Emails
       @project = project
       @user = user
 
-      mail(to: recipient(user.id, project.group), subject: subject("Project cleanup has completed"))
+      mail(to: user.notification_email_for(project.group), subject: subject("Project cleanup has completed"))
     end
 
     def repository_cleanup_failure_email(project, user, error)
@@ -36,7 +36,7 @@ module Emails
       @user = user
       @error = error
 
-      mail(to: recipient(user.id, project.group), subject: subject("Project cleanup failure"))
+      mail(to: user.notification_email_for(project.group), subject: subject("Project cleanup failure"))
     end
 
     def repository_push_email(project_id, opts = {})
diff --git a/app/mailers/emails/remote_mirrors.rb b/app/mailers/emails/remote_mirrors.rb
index f3938a052b0..9cde53918b9 100644
--- a/app/mailers/emails/remote_mirrors.rb
+++ b/app/mailers/emails/remote_mirrors.rb
@@ -5,8 +5,9 @@ module Emails
     def remote_mirror_update_failed_email(remote_mirror_id, recipient_id)
       @remote_mirror = RemoteMirror.find_by_id(remote_mirror_id)
       @project = @remote_mirror.project
+      user = User.find(recipient_id)
 
-      mail(to: recipient(recipient_id, @project.group), subject: subject('Remote mirror update failed'))
+      mail(to: user.notification_email_for(@project.group), subject: subject('Remote mirror update failed'))
     end
   end
 end
diff --git a/app/mailers/notify.rb b/app/mailers/notify.rb
index 6fa1c701cd8..d0b43b4397f 100644
--- a/app/mailers/notify.rb
+++ b/app/mailers/notify.rb
@@ -71,20 +71,6 @@ class Notify < BaseMailer
     address.format
   end
 
-  # Look up a User's notification email for a particular context.
-  # Can look up by their ID or can accept a User object.
-  #
-  # recipient          - User object OR a User ID
-  # notification_group - The parent group of the notification
-  #
-  # Returns a String containing the User's email address.
-  def recipient(recipient, notification_group = nil)
-    user = recipient if recipient.is_a?(User)
-    user ||= User.find(recipient)
-
-    user.notification_email_for(notification_group)
-  end
-
   # Formats arguments into a String suitable for use as an email subject
   #
   # extra - Extra Strings to be inserted into the subject