Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/models/account.rb`: Not a real conflict, just upstream getting rid of unused constants too close to glitch-soc-specific contents. Removed unused constants like upstream did. - `app/models/trends.rb`: Conflict because glitch-soc disabled email notifications for trending links. Upstream has refactored this quite a bit and added trending posts. Took upstream code, but disabling the extra trending stuff will come in another commit. - `app/views/admin/trends/links/index.html.haml`: Conflict due to glitch-soc's theming system. Ported upstream changes accordingly.
This commit is contained in:
7
db/migrate/20220202200743_add_trendable_to_accounts.rb
Normal file
7
db/migrate/20220202200743_add_trendable_to_accounts.rb
Normal file
@@ -0,0 +1,7 @@
|
||||
class AddTrendableToAccounts < ActiveRecord::Migration[6.1]
|
||||
def change
|
||||
add_column :accounts, :trendable, :boolean
|
||||
add_column :accounts, :reviewed_at, :datetime
|
||||
add_column :accounts, :requested_review_at, :datetime
|
||||
end
|
||||
end
|
||||
5
db/migrate/20220202200926_add_trendable_to_statuses.rb
Normal file
5
db/migrate/20220202200926_add_trendable_to_statuses.rb
Normal file
@@ -0,0 +1,5 @@
|
||||
class AddTrendableToStatuses < ActiveRecord::Migration[6.1]
|
||||
def change
|
||||
add_column :statuses, :trendable, :boolean
|
||||
end
|
||||
end
|
||||
@@ -0,0 +1,6 @@
|
||||
class AddIpsToEmailDomainBlocks < ActiveRecord::Migration[6.1]
|
||||
def change
|
||||
add_column :email_domain_blocks, :ips, :inet, array: true
|
||||
add_column :email_domain_blocks, :last_refresh_at, :datetime
|
||||
end
|
||||
end
|
||||
Reference in New Issue
Block a user