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.
13 lines
438 B
Ruby
13 lines
438 B
Ruby
# Read about interceptors in http://guides.rubyonrails.org/action_mailer_basics.html#intercepting-emails
|
|
class EmailTemplateInterceptor
|
|
extend Gitlab::CurrentSettings
|
|
|
|
def self.delivering_email(message)
|
|
# Remove HTML part if HTML emails are disabled.
|
|
unless current_application_settings.html_emails_enabled
|
|
message.parts.delete_if do |part|
|
|
part.content_type.start_with?('text/html')
|
|
end
|
|
end
|
|
end
|
|
end
|