Add latest changes from gitlab-org/gitlab@master

1 files changed, 19 insertions, 0 deletions

diff --git a/db/migrate/20200304124406_add_unlock_membership_to_ldap_of_groups.rb b/db/migrate/20200304124406_add_unlock_membership_to_ldap_of_groups.rb
new file mode 100644
index 00000000000..2aa58c92c3e
--- /dev/null
+++ b/db/migrate/20200304124406_add_unlock_membership_to_ldap_of_groups.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class AddUnlockMembershipToLdapOfGroups < ActiveRecord::Migration[5.2]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  def up
+    with_lock_retries do
+      add_column(:namespaces, :unlock_membership_to_ldap, :boolean)
+    end
+  end
+
+  def down
+    with_lock_retries do
+      remove_column :namespaces, :unlock_membership_to_ldap
+    end
+  end
+end