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/models/note.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'app/models/note.rb')

diff --git a/app/models/note.rb b/app/models/note.rb
index a84db8982e5..01a778a7424 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -3,7 +3,6 @@
 # A note of this type is never resolvable.
 class Note < ActiveRecord::Base
   extend ActiveModel::Naming
-  include Gitlab::CurrentSettings
   include Participable
   include Mentionable
   include Awardable
@@ -196,7 +195,7 @@ class Note < ActiveRecord::Base
   end
 
   def max_attachment_size
-    current_application_settings.max_attachment_size.megabytes.to_i
+    Gitlab::CurrentSettings.max_attachment_size.megabytes.to_i
   end
 
   def hook_attrs
-- 
cgit v1.2.3