Merge branch 'kb_development' into kb_migration

This commit is contained in:
KMY 2023-03-08 16:38:48 +09:00
commit 9e2390f3c9
57 changed files with 227 additions and 64 deletions

View file

@ -0,0 +1,6 @@
class AddImageSizeToCustomEmojis < ActiveRecord::Migration[6.1]
def change
add_column :custom_emojis, :image_width, :integer
add_column :custom_emojis, :image_height, :integer
end
end

View file

@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema.define(version: 2023_02_23_102416) do
ActiveRecord::Schema.define(version: 2023_03_08_061833) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@ -338,6 +338,8 @@ ActiveRecord::Schema.define(version: 2023_02_23_102416) do
t.boolean "visible_in_picker", default: true, null: false
t.bigint "category_id"
t.integer "image_storage_schema_version"
t.integer "image_width"
t.integer "image_height"
t.index ["shortcode", "domain"], name: "index_custom_emojis_on_shortcode_and_domain", unique: true
end