Merge conflict resolution

app/models/user.rb

@@ -1061,6 +1061,12 @@ class User < ActiveRecord::Base
     user_synced_attributes_metadata&.read_only?(attribute)
   end
 
+  # override, from Devise
+  def lock_access!
+    Gitlab::AppLogger.info("Account Locked: username=#{username} reason=invalid_login_attempts")
+    super
+  end
+
   protected
 
   # override, from Devise::Validatable
@@ -1069,12 +1075,6 @@ class User < ActiveRecord::Base
     super
   end
 
-  # override, from Devise
-  def lock_access!
-    Gitlab::AppLogger.info("Account Locked: username=#{username} reason=invalid_login_attempts")
-    super
-  end
-
   private
 
   def ci_projects_union