Add latest changes from gitlab-org/gitlab@master

1 files changed, 21 insertions, 0 deletions

diff --git a/app/services/users/repair_ldap_blocked_service.rb b/app/services/users/repair_ldap_blocked_service.rb
new file mode 100644
index 00000000000..378145a65b3
--- /dev/null
+++ b/app/services/users/repair_ldap_blocked_service.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Users
+  class RepairLdapBlockedService
+    attr_accessor :user
+
+    def initialize(user)
+      @user = user
+    end
+
+    def execute
+      user.block if ldap_hard_blocked?
+    end
+
+    private
+
+    def ldap_hard_blocked?
+      user.ldap_blocked? && !user.ldap_user?
+    end
+  end
+end