From eaada9d7066a20b5af815f723e09cde60a5c8c10 Mon Sep 17 00:00:00 2001
From: Mario de la Ossa <mdelaossa@gitlab.com>
Date: Fri, 2 Feb 2018 18:39:55 +0000
Subject: use Gitlab::UserSettings directly as a singleton instead of
 including/extending it

---
 app/mailers/base_mailer.rb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'app/mailers/base_mailer.rb')

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 }
-- 
cgit v1.2.3