10 files changed, 12 insertions, 12 deletions
diff --git a/app/models/concerns/spammable.rb b/app/models/concerns/spammable.rb
index 731d9b9a745..ba9aea112c0 100644
--- a/app/models/concerns/spammable.rb
+++ b/app/models/concerns/spammable.rb
@@ -28,7 +28,7 @@ module Spammable
 
   def submittable_as_spam?
     if user_agent_detail
-      user_agent_detail.submittable? && Gitlab::CurrentSettings.current_application_settings.akismet_enabled
+      user_agent_detail.submittable? && Gitlab::CurrentSettings.akismet_enabled
     else
       false
     end
diff --git a/app/models/issue_assignee.rb b/app/models/issue_assignee.rb
index 06d760b6a89..b001ef7ac89 100644
--- a/app/models/issue_assignee.rb
+++ b/app/models/issue_assignee.rb
@@ -1,5 +1,5 @@
 class IssueAssignee < ActiveRecord::Base
-  extend Gitlab::CurrentSettings
+  # extend Gitlab::CurrentSettings
 
   belongs_to :issue
   belongs_to :assignee, class_name: "User", foreign_key: :user_id
diff --git a/app/models/key.rb b/app/models/key.rb
index f119b15c737..ffda30e3c3b 100644
--- a/app/models/key.rb
+++ b/app/models/key.rb
@@ -1,7 +1,7 @@
 require 'digest/md5'
 
 class Key < ActiveRecord::Base
-  include Gitlab::CurrentSettings
+  # include Gitlab::CurrentSettings
   include Sortable
 
   belongs_to :user
diff --git a/app/models/namespace.rb b/app/models/namespace.rb
index 0601a61a926..1a78a14dcb1 100644
--- a/app/models/namespace.rb
+++ b/app/models/namespace.rb
@@ -4,7 +4,7 @@ class Namespace < ActiveRecord::Base
   include CacheMarkdownField
   include Sortable
   include Gitlab::ShellAdapter
-  include Gitlab::CurrentSettings
+  # include Gitlab::CurrentSettings
   include Gitlab::VisibilityLevel
   include Routable
   include AfterCommitQueue
diff --git a/app/models/note.rb b/app/models/note.rb
index 8939e590ef1..1ae58a471a9 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -3,7 +3,7 @@
 # A note of this type is never resolvable.
 class Note < ActiveRecord::Base
   extend ActiveModel::Naming
-  include Gitlab::CurrentSettings
+  # include Gitlab::CurrentSettings
   include Participable
   include Mentionable
   include Awardable
diff --git a/app/models/project.rb b/app/models/project.rb
index 4689b588906..c3191336024 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -4,7 +4,7 @@ class Project < ActiveRecord::Base
   include Gitlab::ConfigHelper
   include Gitlab::ShellAdapter
   include Gitlab::VisibilityLevel
-  include Gitlab::CurrentSettings
+  # include Gitlab::CurrentSettings
   include AccessRequestable
   include Avatarable
   include CacheMarkdownField
@@ -20,7 +20,7 @@ class Project < ActiveRecord::Base
   include GroupDescendant
 
   extend Gitlab::ConfigHelper
-  extend Gitlab::CurrentSettings
+  # extend Gitlab::CurrentSettings
 
   BoardLimitExceeded = Class.new(StandardError)
 
diff --git a/app/models/project_services/kubernetes_service.rb b/app/models/project_services/kubernetes_service.rb
index 8ba07173c74..7b946bb9c62 100644
--- a/app/models/project_services/kubernetes_service.rb
+++ b/app/models/project_services/kubernetes_service.rb
@@ -1,5 +1,5 @@
 class KubernetesService < DeploymentService
-  include Gitlab::CurrentSettings
+  # include Gitlab::CurrentSettings
   include Gitlab::Kubernetes
   include ReactiveCaching
 
diff --git a/app/models/protected_branch.rb b/app/models/protected_branch.rb
index 89bfc5f9a9c..35cfcbf178d 100644
--- a/app/models/protected_branch.rb
+++ b/app/models/protected_branch.rb
@@ -2,7 +2,7 @@ class ProtectedBranch < ActiveRecord::Base
   include Gitlab::ShellAdapter
   include ProtectedRef
 
-  extend Gitlab::CurrentSettings
+  # extend Gitlab::CurrentSettings
 
   protected_ref_access_levels :merge, :push
 
diff --git a/app/models/snippet.rb b/app/models/snippet.rb
index 9533aa7f555..5d4445152ea 100644
--- a/app/models/snippet.rb
+++ b/app/models/snippet.rb
@@ -10,7 +10,7 @@ class Snippet < ActiveRecord::Base
   include Spammable
   include Editable
 
-  extend Gitlab::CurrentSettings
+  # extend Gitlab::CurrentSettings
 
   cache_markdown_field :title, pipeline: :single_line
   cache_markdown_field :description
diff --git a/app/models/user.rb b/app/models/user.rb
index 9459b6d4fa4..386e3e82aa3 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -2,10 +2,10 @@ require 'carrierwave/orm/activerecord'
 
 class User < ActiveRecord::Base
   extend Gitlab::ConfigHelper
-  extend Gitlab::CurrentSettings
+  # extend Gitlab::CurrentSettings
 
   include Gitlab::ConfigHelper
-  include Gitlab::CurrentSettings
+  # include Gitlab::CurrentSettings
   include Gitlab::SQL::Pattern
   include Avatarable
   include Referable