Add latest changes from gitlab-org/gitlab@master

2 files changed, 20 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
diff --git a/db/schema.rb b/db/schema.rb
index 4fd4d839b31..2ecc0b9b2d6 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -2787,6 +2787,7 @@ ActiveRecord::Schema.define(version: 2020_03_19_203901) do
     t.integer "max_artifacts_size"
     t.boolean "mentions_disabled"
     t.integer "default_branch_protection", limit: 2
+    t.boolean "unlock_membership_to_ldap"
     t.index ["created_at"], name: "index_namespaces_on_created_at"
     t.index ["custom_project_templates_group_id", "type"], name: "index_namespaces_on_custom_project_templates_group_id_and_type", where: "(custom_project_templates_group_id IS NOT NULL)"
     t.index ["file_template_project_id"], name: "index_namespaces_on_file_template_project_id"