Merge branch 'master' into gs-master

2017-10-27 09:45:25 -05:00
parent 656f5b6f87 781105293c
commit 870d71b78b
12 changed files with 88 additions and 44 deletions
--- 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