diff options
Diffstat (limited to 'app')
-rw-r--r-- | app/models/user.rb | 7 | ||||
-rw-r--r-- | app/models/user_preference.rb | 3 |
2 files changed, 4 insertions, 6 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 4560eb1f9c7..791eb1b574f 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -31,7 +31,6 @@ class User < ApplicationRecord include RestrictedSignup include StripAttribute include EachBatch - include SafelyChangeColumnDefault DEFAULT_NOTIFICATION_LEVEL = :participating @@ -60,8 +59,6 @@ class User < ApplicationRecord INCOMING_MAIL_TOKEN_PREFIX = 'glimt-' FEED_TOKEN_PREFIX = 'glft-' - columns_changing_default :notified_of_own_activity - # lib/tasks/tokens.rake needs to be updated when changing mail and feed tokens add_authentication_token_field :incoming_email_token, token_generator: -> { self.generate_incoming_mail_token } add_authentication_token_field :feed_token, format_with_prefix: :prefix_for_feed_token @@ -2066,6 +2063,7 @@ class User < ApplicationRecord # override, from Devise def lock_access!(opts = {}) Gitlab::AppLogger.info("Account Locked: username=#{username}") + audit_lock_access super end @@ -2592,6 +2590,9 @@ class User < ApplicationRecord def prefix_for_feed_token FEED_TOKEN_PREFIX end + + # method overriden in EE + def audit_lock_access; end end User.prepend_mod_with('User') diff --git a/app/models/user_preference.rb b/app/models/user_preference.rb index 4d517408154..e527542e357 100644 --- a/app/models/user_preference.rb +++ b/app/models/user_preference.rb @@ -2,15 +2,12 @@ class UserPreference < ApplicationRecord include IgnorableColumns - include SafelyChangeColumnDefault # We could use enums, but Rails 4 doesn't support multiple # enum options with same name for multiple fields, also it creates # extra methods that aren't really needed here. NOTES_FILTERS = { all_notes: 0, only_comments: 1, only_activity: 2 }.freeze - columns_changing_default :tab_width, :time_display_relative, :render_whitespace_in_code - belongs_to :user scope :with_user, -> { joins(:user) } |