diff options
author | David Yip <yipdw@member.fsf.org> | 2017-10-27 09:45:25 -0500 |
---|---|---|
committer | David Yip <yipdw@member.fsf.org> | 2017-10-27 09:45:25 -0500 |
commit | 870d71b78be74b7fab4892a79a87aff39b1e2726 (patch) | |
tree | 0628116973b67c573509f8affe50cc3d6c9a6f4f /db/schema.rb | |
parent | 656f5b6f87f2dcb80644edbedc4d2330eb5bee8d (diff) | |
parent | 781105293cf129c84ef0b91ec8cd27b7127cf951 (diff) |
Merge branch 'master' into gs-master
Diffstat (limited to 'db/schema.rb')
-rw-r--r-- | db/schema.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/db/schema.rb b/db/schema.rb index c09876c4d..f96a5340f 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -111,6 +111,7 @@ ActiveRecord::Schema.define(version: 20171021191900) do t.boolean "disabled", default: false, null: false t.string "uri" t.string "image_remote_url" + t.boolean "visible_in_picker", default: true, null: false t.index ["shortcode", "domain"], name: "index_custom_emojis_on_shortcode_and_domain", unique: true end |