random-mirrors/gab-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge resolving

Browse Source
This commit is contained in:
mgabdev 2021-01-05 11:35:23 -05:00
parent b62b1166dc
commit 2fcc99cccf
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/chat_conversation_account.rb
View File

@ -12,7 +12,7 @@
# is_approved :boolean default(FALSE), not null # is_approved :boolean default(FALSE), not null
# created_at :datetime not null # created_at :datetime not null
# updated_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 # chat_message_expiration_policy :string
# is_muted :boolean default(FALSE), not null # is_muted :boolean default(FALSE), not null
# #

2
db/schema.rb
View File

@ -221,7 +221,7 @@ ActiveRecord::Schema.define(version: 2021_01_03_150000) do
t.boolean "is_approved", default: false, null: false t.boolean "is_approved", default: false, null: false
t.datetime "created_at", null: false t.datetime "created_at", null: false
t.datetime "updated_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.string "chat_message_expiration_policy"
t.boolean "is_muted", default: false, null: false t.boolean "is_muted", default: false, null: false
t.index ["account_id"], name: "index_chat_conversation_accounts_on_account_id" t.index ["account_id"], name: "index_chat_conversation_accounts_on_account_id"