merge resolving
This commit is contained in:
parent
b62b1166dc
commit
2fcc99cccf
|
@ -12,7 +12,7 @@
|
|||
# is_approved :boolean default(FALSE), not null
|
||||
# created_at :datetime not null
|
||||
# updated_at :datetime not null
|
||||
# unread_count :bigint(8) default(0)
|
||||
# unread_count :bigint(8) default(0), not null
|
||||
# chat_message_expiration_policy :string
|
||||
# is_muted :boolean default(FALSE), not null
|
||||
#
|
||||
|
|
|
@ -221,7 +221,7 @@ ActiveRecord::Schema.define(version: 2021_01_03_150000) do
|
|||
t.boolean "is_approved", default: false, null: false
|
||||
t.datetime "created_at", null: false
|
||||
t.datetime "updated_at", null: false
|
||||
t.bigint "unread_count", default: 0
|
||||
t.bigint "unread_count", default: 0, null: false
|
||||
t.string "chat_message_expiration_policy"
|
||||
t.boolean "is_muted", default: false, null: false
|
||||
t.index ["account_id"], name: "index_chat_conversation_accounts_on_account_id"
|
||||
|
|
Loading…
Reference in New Issue