Add latest changes from gitlab-org/gitlab@master

1 files changed, 25 insertions, 0 deletions

diff --git a/db/migrate/20200311093210_create_user_highest_roles.rb b/db/migrate/20200311093210_create_user_highest_roles.rb
new file mode 100644
index 00000000000..36007f196d1
--- /dev/null
+++ b/db/migrate/20200311093210_create_user_highest_roles.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+class CreateUserHighestRoles < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  def up
+    with_lock_retries do
+      create_table :user_highest_roles, id: false do |t|
+        t.datetime_with_timezone :updated_at, null: false
+        t.references :user, primary_key: true, default: nil, index: false, foreign_key: { on_delete: :cascade }
+        t.integer :highest_access_level
+
+        t.index [:user_id, :highest_access_level]
+      end
+    end
+  end
+
+  def down
+    with_lock_retries do
+      drop_table :user_highest_roles
+    end
+  end
+end