Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - .eslintrc.yml Removed, as upstream removed it. - app/controllers/admin/statuses_controller.rb Minor code cleanup when porting one of our features. - app/models/account.rb Note length validation has changed upstream. We now use upstream's validation (dropped legacy glitch-soc account metadata stuff) but with configurable limit. - app/services/post_status_service.rb Upstream has added support for scheduled toots, refactoring the code a bit. Adapted our changes to this refactoring. - app/views/stream_entries/_detailed_status.html.haml Not a real conflict, changes too close. - app/views/stream_entries/_simple_status.html.haml Not a real conflict, changes too close.
This commit is contained in:
@@ -1,7 +1,15 @@
|
||||
class DowncaseCustomEmojiDomains < ActiveRecord::Migration[5.2]
|
||||
disable_ddl_transaction!
|
||||
|
||||
def change
|
||||
def up
|
||||
duplicates = CustomEmoji.connection.select_all('SELECT string_agg(id::text, \',\') AS ids FROM custom_emojis GROUP BY shortcode, lower(domain) HAVING count(*) > 1').to_hash
|
||||
|
||||
duplicates.each do |row|
|
||||
CustomEmoji.where(id: row['ids'].split(',')[0...-1]).destroy_all
|
||||
end
|
||||
|
||||
CustomEmoji.in_batches.update_all('domain = lower(domain)')
|
||||
end
|
||||
|
||||
def down; end
|
||||
end
|
||||
|
||||
9
db/migrate/20190103124649_create_scheduled_statuses.rb
Normal file
9
db/migrate/20190103124649_create_scheduled_statuses.rb
Normal file
@@ -0,0 +1,9 @@
|
||||
class CreateScheduledStatuses < ActiveRecord::Migration[5.2]
|
||||
def change
|
||||
create_table :scheduled_statuses do |t|
|
||||
t.belongs_to :account, foreign_key: { on_delete: :cascade }
|
||||
t.datetime :scheduled_at, index: true
|
||||
t.jsonb :params
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -0,0 +1,8 @@
|
||||
class AddScheduledStatusIdToMediaAttachments < ActiveRecord::Migration[5.2]
|
||||
disable_ddl_transaction!
|
||||
|
||||
def change
|
||||
add_reference :media_attachments, :scheduled_status, foreign_key: { on_delete: :nullify }, index: false
|
||||
add_index :media_attachments, :scheduled_status_id, algorithm: :concurrently
|
||||
end
|
||||
end
|
||||
Reference in New Issue
Block a user