Skip to content

Commit 79a4fe8

Browse files
authored
Merge pull request mastodon#104 from CrossGate-Pawoo/update_2.9.4_pre_migration
Pre migration for v2.9.4
2 parents 3cb04fd + f11c062 commit 79a4fe8

55 files changed

Lines changed: 957 additions & 32 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

app/models/account.rb

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@
4747
# fields :jsonb
4848
# actor_type :string
4949
# also_known_as :string is an Array
50+
# discoverable :boolean
51+
# silenced_at :datetime
52+
# suspended_at :datetime
5053
#
5154

5255
class Account < ApplicationRecord

app/models/domain_block.rb

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@
33
#
44
# Table name: domain_blocks
55
#
6-
# id :bigint(8) not null, primary key
7-
# domain :string default(""), not null
8-
# created_at :datetime not null
9-
# updated_at :datetime not null
10-
# severity :integer default("silence")
11-
# reject_media :boolean default(FALSE), not null
6+
# id :bigint(8) not null, primary key
7+
# domain :string default(""), not null
8+
# created_at :datetime not null
9+
# updated_at :datetime not null
10+
# severity :integer default("silence")
11+
# reject_media :boolean default(FALSE), not null
12+
# reject_reports :boolean default(FALSE), not null
1213
#
1314

1415
class DomainBlock < ApplicationRecord

app/models/identity.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
#
44
# Table name: identities
55
#
6-
# id :integer not null, primary key
7-
# user_id :integer
86
# provider :string default(""), not null
97
# uid :string default(""), not null
108
# created_at :datetime not null
119
# updated_at :datetime not null
10+
# id :bigint(8) not null, primary key
11+
# user_id :bigint(8)
1212
#
1313

1414
class Identity < ApplicationRecord

app/models/import.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
# data_file_size :integer
1414
# data_updated_at :datetime
1515
# account_id :bigint(8) not null
16+
# overwrite :boolean default(FALSE), not null
1617
#
1718

1819
class Import < ApplicationRecord

app/models/invite.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
# uses :integer default(0), not null
1212
# created_at :datetime not null
1313
# updated_at :datetime not null
14+
# autofollow :boolean default(FALSE), not null
1415
#
1516

1617
class Invite < ApplicationRecord

app/models/media_attachment.rb

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,22 @@
33
#
44
# Table name: media_attachments
55
#
6-
# id :bigint(8) not null, primary key
7-
# status_id :bigint(8)
8-
# file_file_name :string
9-
# file_content_type :string
10-
# file_file_size :integer
11-
# file_updated_at :datetime
12-
# remote_url :string default(""), not null
13-
# created_at :datetime not null
14-
# updated_at :datetime not null
15-
# shortcode :string
16-
# type :integer default("image"), not null
17-
# file_meta :json
18-
# account_id :bigint(8)
19-
# description :text
6+
# id :bigint(8) not null, primary key
7+
# status_id :bigint(8)
8+
# file_file_name :string
9+
# file_content_type :string
10+
# file_file_size :integer
11+
# file_updated_at :datetime
12+
# remote_url :string default(""), not null
13+
# created_at :datetime not null
14+
# updated_at :datetime not null
15+
# shortcode :string
16+
# type :integer default("image"), not null
17+
# file_meta :json
18+
# account_id :bigint(8)
19+
# description :text
20+
# scheduled_status_id :bigint(8)
21+
# blurhash :string
2022
#
2123

2224
class MediaAttachment < ApplicationRecord

app/models/mention.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
# created_at :datetime not null
99
# updated_at :datetime not null
1010
# account_id :bigint(8)
11+
# silent :boolean default(FALSE), not null
1112
#
1213

1314
class Mention < ApplicationRecord

app/models/report.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
# target_account_id :bigint(8) not null
1515
# pawoo_report_type :integer default("other"), not null
1616
# assigned_account_id :bigint(8)
17+
# uri :string
1718
#
1819

1920
class Report < ApplicationRecord

app/models/status.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
# account_id :bigint(8) not null
2424
# application_id :bigint(8)
2525
# in_reply_to_account_id :bigint(8)
26+
# poll_id :bigint(8)
2627
#
2728

2829
class Status < ApplicationRecord

app/models/user.rb

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@
3535
# moderator :boolean default(FALSE), not null
3636
# invite_id :bigint(8)
3737
# remember_token :string
38+
# chosen_languages :string is an Array
39+
# created_by_application_id :bigint(8)
40+
# approved :boolean default(TRUE), not null
3841
#
3942

4043
class User < ApplicationRecord

0 commit comments

Comments
 (0)