summaryrefslogtreecommitdiff
path: root/app/models/user.rb
diff options
context:
space:
mode:
Diffstat (limited to 'app/models/user.rb')
-rw-r--r--app/models/user.rb4
1 files changed, 2 insertions, 2 deletions
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