From d13349af47295065b8a658b0d74499c59ff3ad4b Mon Sep 17 00:00:00 2001
From: Brian Neel <brian@gitlab.com>
Date: Wed, 27 Sep 2017 21:53:15 -0400
Subject: Merge conflict resolution

---
 app/models/user.rb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 9fc6d2806c3..195490c95c7 100644
--- a/app/models/user.rb
+++ b/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
-- 
cgit v1.2.1