diff options
| author | Oswaldo Ferreira <oswaldo@gitlab.com> | 2017-10-26 21:13:27 +0200 |
|---|---|---|
| committer | Oswaldo Ferreira <oswaldo@gitlab.com> | 2017-10-26 21:13:27 +0200 |
| commit | 7a534231493f7f4220995b3accc92d4d002a6fa5 (patch) | |
| tree | 9a4d055bc2b851ffefdd89a41ecc8eb71495c5b0 /app/models/user.rb | |
| parent | 9931ef4a8a9fa9544729fe39cb3572d278819c8d (diff) | |
| download | gitlab-ce-37698-current-settings-singleton.tar.gz | |
WIP: Replace current settings module inclusion by "singleton"37698-current-settings-singleton
Diffstat (limited to 'app/models/user.rb')
| -rw-r--r-- | app/models/user.rb | 4 |
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 |