5883ce95ef
The initializers including this were doing so at the top level, so every object loaded after them had a `current_application_settings` method. However, if someone had rack-attack enabled (which was loaded before these initializers), it would try to load the API, and fail, because `Gitlab::CurrentSettings` didn't have that method. To fix this: 1. Don't include `Gitlab::CurrentSettings` at the top level. We do not need `Object.new.current_application_settings` to work. 2. Make `Gitlab::CurrentSettings` explicitly `extend self`, as we already use it like that in several places. 3. Change the initializers to use that new form.
36 lines
931 B
Ruby
36 lines
931 B
Ruby
class BaseMailer < ActionMailer::Base
|
|
include Gitlab::CurrentSettings
|
|
|
|
around_action :render_with_default_locale
|
|
|
|
helper ApplicationHelper
|
|
helper MarkupHelper
|
|
|
|
attr_accessor :current_user
|
|
helper_method :current_user, :can?, :current_application_settings
|
|
|
|
default from: proc { default_sender_address.format }
|
|
default reply_to: proc { default_reply_to_address.format }
|
|
|
|
def can?
|
|
Ability.allowed?(current_user, action, subject)
|
|
end
|
|
|
|
private
|
|
|
|
def render_with_default_locale(&block)
|
|
Gitlab::I18n.with_default_locale(&block)
|
|
end
|
|
|
|
def default_sender_address
|
|
address = Mail::Address.new(Gitlab.config.gitlab.email_from)
|
|
address.display_name = Gitlab.config.gitlab.email_display_name
|
|
address
|
|
end
|
|
|
|
def default_reply_to_address
|
|
address = Mail::Address.new(Gitlab.config.gitlab.email_reply_to)
|
|
address.display_name = Gitlab.config.gitlab.email_display_name
|
|
address
|
|
end
|
|
end
|