diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-19 00:06:37 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-19 00:06:37 +0300 |
commit | 4682f5015a5a2d7eedb66b3c90aee931d3789d0b (patch) | |
tree | 6240a8a5cf3584a893c6c3351141446e7856dc12 /db | |
parent | 6d59e989185a7d2645792b713d1b5d95d46651fd (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'db')
-rw-r--r-- | db/migrate/20190912223232_add_role_to_users.rb | 12 | ||||
-rw-r--r-- | db/schema.rb | 1 |
2 files changed, 13 insertions, 0 deletions
diff --git a/db/migrate/20190912223232_add_role_to_users.rb b/db/migrate/20190912223232_add_role_to_users.rb new file mode 100644 index 00000000000..afbd78ed509 --- /dev/null +++ b/db/migrate/20190912223232_add_role_to_users.rb @@ -0,0 +1,12 @@ +# frozen_string_literal: true + +# See http://doc.gitlab.com/ce/development/migration_style_guide.html +# for more information on how to write migrations for GitLab. + +class AddRoleToUsers < ActiveRecord::Migration[5.2] + DOWNTIME = false + + def change + add_column :users, :role, :smallint + end +end diff --git a/db/schema.rb b/db/schema.rb index b39eb408b0a..f3a2b4608f5 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -3780,6 +3780,7 @@ ActiveRecord::Schema.define(version: 2019_10_16_220135) do t.string "first_name", limit: 255 t.string "last_name", limit: 255 t.string "static_object_token", limit: 255 + t.integer "role", limit: 2 t.index "lower((name)::text)", name: "index_on_users_name_lower" t.index ["accepted_term_id"], name: "index_users_on_accepted_term_id" t.index ["admin"], name: "index_users_on_admin" |