diff options
| author | Mario de la Ossa <mdelaossa@gitlab.com> | 2018-02-02 21:39:55 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-02-02 21:39:55 +0300 |
| commit | eaada9d7066a20b5af815f723e09cde60a5c8c10 (patch) | |
| tree | 72ba4231e28f1c5e5405db21e0611a55e6428145 /app/mailers/base_mailer.rb | |
| parent | 8fa2932dc5cc7687e7d85ae7b00c07fd9bcc24a4 (diff) | |
use Gitlab::UserSettings directly as a singleton instead of including/extending it
Diffstat (limited to 'app/mailers/base_mailer.rb')
| -rw-r--r-- | app/mailers/base_mailer.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/app/mailers/base_mailer.rb b/app/mailers/base_mailer.rb index 8e99db444d6..654468bc7fe 100644 --- a/app/mailers/base_mailer.rb +++ b/app/mailers/base_mailer.rb @@ -1,13 +1,11 @@ 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 + helper_method :current_user, :can? default from: proc { default_sender_address.format } default reply_to: proc { default_reply_to_address.format } |