f39ba1bb5e
* upstream/master: (372 commits)
Enable Lint/StringConversionInInterpolation cop and autocorrect offenses
resolve duplicated changelog entry
credit myself 😄
change determine conditions
override subject method in devise mailer
follow the styleguide: Don't use parentheses around a literal
wrap subject with method subject
move spec back into shared example `an email sent from GitLab`
stub config settings in spec
remove empty line at block body end
remove extra entry
create new test in `spec/mailers/notify_spec.rb`
move changelog to 8.13
add configurable email subject suffix
Fixes sidebar navigation.
Convert "SSH Keys" Spinach features to RSpec
Enable import/export back for non-admins
Update gitlab-shell to 3.6.3
Updated artwork of empty group state.
Better empty state for Groups view.
...
174 lines
5.3 KiB
Ruby
174 lines
5.3 KiB
Ruby
class Notify < BaseMailer
|
|
include ActionDispatch::Routing::PolymorphicRoutes
|
|
|
|
include Emails::Issues
|
|
include Emails::MergeRequests
|
|
include Emails::Notes
|
|
include Emails::Projects
|
|
include Emails::Profile
|
|
include Emails::Builds
|
|
include Emails::Pipelines
|
|
include Emails::Members
|
|
|
|
add_template_helper MergeRequestsHelper
|
|
add_template_helper DiffHelper
|
|
add_template_helper BlobHelper
|
|
add_template_helper EmailsHelper
|
|
add_template_helper MembersHelper
|
|
add_template_helper GitlabRoutingHelper
|
|
|
|
def test_email(recipient_email, subject, body)
|
|
mail(to: recipient_email,
|
|
subject: subject,
|
|
body: body.html_safe,
|
|
content_type: 'text/html'
|
|
)
|
|
end
|
|
|
|
# Splits "gitlab.corp.company.com" up into "gitlab.corp.company.com",
|
|
# "corp.company.com" and "company.com".
|
|
# Respects set tld length so "company.co.uk" won't match "somethingelse.uk"
|
|
def self.allowed_email_domains
|
|
domain_parts = Gitlab.config.gitlab.host.split(".")
|
|
allowed_domains = []
|
|
begin
|
|
allowed_domains << domain_parts.join(".")
|
|
domain_parts.shift
|
|
end while domain_parts.length > ActionDispatch::Http::URL.tld_length
|
|
|
|
allowed_domains
|
|
end
|
|
|
|
def can_send_from_user_email?(sender)
|
|
sender_domain = sender.email.split("@").last
|
|
self.class.allowed_email_domains.include?(sender_domain)
|
|
end
|
|
|
|
private
|
|
|
|
# Return an email address that displays the name of the sender.
|
|
# Only the displayed name changes; the actual email address is always the same.
|
|
def sender(sender_id, send_from_user_email = false)
|
|
return unless sender = User.find(sender_id)
|
|
|
|
address = default_sender_address
|
|
address.display_name = sender.name
|
|
|
|
if send_from_user_email && can_send_from_user_email?(sender)
|
|
address.address = sender.email
|
|
end
|
|
|
|
address.format
|
|
end
|
|
|
|
# Look up a User by their ID and return their email address
|
|
#
|
|
# recipient_id - User ID
|
|
#
|
|
# Returns a String containing the User's email address.
|
|
def recipient(recipient_id)
|
|
@current_user = User.find(recipient_id)
|
|
@current_user.notification_email
|
|
end
|
|
|
|
# Formats arguments into a String suitable for use as an email subject
|
|
#
|
|
# extra - Extra Strings to be inserted into the subject
|
|
#
|
|
# Examples
|
|
#
|
|
# >> subject('Lorem ipsum')
|
|
# => "Lorem ipsum"
|
|
#
|
|
# # Automatically inserts Project name when @project is set
|
|
# >> @project = Project.last
|
|
# => #<Project id: 1, name: "Ruby on Rails", path: "ruby_on_rails", ...>
|
|
# >> subject('Lorem ipsum')
|
|
# => "Ruby on Rails | Lorem ipsum "
|
|
#
|
|
# # Accepts multiple arguments
|
|
# >> subject('Lorem ipsum', 'Dolor sit amet')
|
|
# => "Lorem ipsum | Dolor sit amet"
|
|
def subject(*extra)
|
|
subject = ""
|
|
subject << "#{@project.name} | " if @project
|
|
subject << extra.join(' | ') if extra.present?
|
|
subject << " | #{Gitlab.config.gitlab.email_subject_suffix}" if Gitlab.config.gitlab.email_subject_suffix.present?
|
|
subject
|
|
end
|
|
|
|
# Return a string suitable for inclusion in the 'Message-Id' mail header.
|
|
#
|
|
# The message-id is generated from the unique URL to a model object.
|
|
def message_id(model)
|
|
model_name = model.class.model_name.singular_route_key
|
|
"<#{model_name}_#{model.id}@#{Gitlab.config.gitlab.host}>"
|
|
end
|
|
|
|
def mail_thread(model, headers = {})
|
|
add_project_headers
|
|
headers["X-GitLab-#{model.class.name}-ID"] = model.id
|
|
headers['X-GitLab-Reply-Key'] = reply_key
|
|
|
|
if !@labels_url && @sent_notification && @sent_notification.unsubscribable?
|
|
headers['List-Unsubscribe'] = "<#{unsubscribe_sent_notification_url(@sent_notification, force: true)}>"
|
|
|
|
@sent_notification_url = unsubscribe_sent_notification_url(@sent_notification)
|
|
end
|
|
|
|
if Gitlab::IncomingEmail.enabled?
|
|
address = Mail::Address.new(Gitlab::IncomingEmail.reply_address(reply_key))
|
|
address.display_name = @project.name_with_namespace
|
|
|
|
headers['Reply-To'] = address
|
|
|
|
fallback_reply_message_id = "<reply-#{reply_key}@#{Gitlab.config.gitlab.host}>".freeze
|
|
headers['References'] ||= ''
|
|
headers['References'] << ' ' << fallback_reply_message_id
|
|
|
|
@reply_by_email = true
|
|
end
|
|
|
|
mail(headers)
|
|
end
|
|
|
|
# Send an email that starts a new conversation thread,
|
|
# with headers suitable for grouping by thread in email clients.
|
|
#
|
|
# See: mail_answer_thread
|
|
def mail_new_thread(model, headers = {})
|
|
headers['Message-ID'] = message_id(model)
|
|
|
|
mail_thread(model, headers)
|
|
end
|
|
|
|
# Send an email that responds to an existing conversation thread,
|
|
# with headers suitable for grouping by thread in email clients.
|
|
#
|
|
# For grouping emails by thread, email clients heuristics require the answers to:
|
|
#
|
|
# * have a subject that begin by 'Re: '
|
|
# * have a 'In-Reply-To' or 'References' header that references the original 'Message-ID'
|
|
#
|
|
def mail_answer_thread(model, headers = {})
|
|
headers['Message-ID'] = "<#{SecureRandom.hex}@#{Gitlab.config.gitlab.host}>"
|
|
headers['In-Reply-To'] = message_id(model)
|
|
headers['References'] = message_id(model)
|
|
|
|
headers[:subject].prepend('Re: ') if headers[:subject]
|
|
|
|
mail_thread(model, headers)
|
|
end
|
|
|
|
def reply_key
|
|
@reply_key ||= SentNotification.reply_key
|
|
end
|
|
|
|
def add_project_headers
|
|
return unless @project
|
|
|
|
headers['X-GitLab-Project'] = @project.name
|
|
headers['X-GitLab-Project-Id'] = @project.id
|
|
headers['X-GitLab-Project-Path'] = @project.path_with_namespace
|
|
end
|
|
end
|