summaryrefslogtreecommitdiff
path: root/db/schema.rb
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-09-11 15:44:42 +0000
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-09-11 15:44:42 +0000
commit9b177bb7c94df6c7d3868235f75939a41acf8718 (patch)
treeef8541d3ef8047f2ac6711b6e030244f812b7b49 /db/schema.rb
parent73a913f2b5f2a5dd36e13e09d74264d1da218d6a (diff)
downloadgitlab-ce-9b177bb7c94df6c7d3868235f75939a41acf8718.tar.gz
Revert "Merge branch 'revert-f2421b2b' into 'master'"revert-2f46c3a8
This reverts merge request !14148
Diffstat (limited to 'db/schema.rb')
-rw-r--r--db/schema.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/db/schema.rb b/db/schema.rb
index df941afa7d7..2149f5ad23d 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1608,6 +1608,7 @@ ActiveRecord::Schema.define(version: 20170905112933) do
t.boolean "notified_of_own_activity"
t.string "preferred_language"
t.string "rss_token"
+ t.integer "theme_id", limit: 2
end
add_index "users", ["admin"], name: "index_users_on_admin", using: :btree