mastodon/db/post_migrate
Claire 24e83246f9 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/models/status.rb`:
  Upstream updated media and edit-related code textually close to glitch-soc
  additions (local-only and content-type).
  Ported upstream changes.
- `app/models/status_edit.rb`:
  Upstream changes textually close to glitch-soc additions (content-type).
  Ported upstream changes.
- `app/serializers/activitypub/note_serializer.rb`:
  Upstream changed how media attachments are handled. Not really a conflict,
  but textually close to glitch-soc additions (directMessage attribute).
  Ported upstream changes.
- `app/services/remove_status_service.rb`:
  Upstream changed how media attachments are handled. Not really a conflict,
  but textually close to glitch-soc additions (DM timeline).
  Ported upstream changes.
- `app/services/update_status_service.rb`:
  Upstream fixed an issue with language selection. Not really a conflict,
  but textually close to glitch-soc additions (content-type).
  Ported upstream changes.
- `db/schema.rb`:
  Upstream added columns to the `status_edits` table, the conflict is because
  of an additional column (`content-type`) in glitch-soc.
  Ported upstream changes.
- `package.json`:
  Upstream dependency (express) textually adjacent to a glitch-soc-specific one
  (favico.js) got updated.
  Updated it as well.
2022-03-10 09:52:45 +01:00
..
.gitkeep
20180813113448_copy_status_stats_cleanup.rb
20180813160548_post_migrate_filters.rb
20181116184611_copy_account_stats_cleanup.rb
20190511152737_remove_suspended_silenced_account_fields.rb
20190519130537_remove_boosts_widening_audience.rb
20190706233204_drop_stream_entries.rb
20190715031050_drop_subscriptions.rb
20190901040524_remove_score_from_tags.rb
20190927124642_remove_invalid_web_push_subscription.rb
20200917193528_migrate_notifications_type.rb
20200917222734_remove_index_notifications_on_account_activity.rb
20201017234926_fill_account_suspension_origin.rb
20210308133107_remove_subscription_expires_at_from_accounts.rb
20210502233513_drop_account_tag_stats.rb
20210507001928_remove_hub_url_from_accounts.rb
20210526193025_remove_lock_version_from_account_stats.rb
20210616214135_remove_current_sign_in_ip_from_users.rb
20210808071221_clear_orphaned_account_notes.rb
20211126000907_drop_account_identity_proofs.rb
20220109213908_remove_action_taken_from_reports.rb
20220118183010_remove_index_users_on_remember_token.rb
20220118183123_remove_rememberable_from_users.rb
20220202201015_remove_trust_level_from_accounts.rb Add trending statuses (#17431) 2022-02-25 00:34:14 +01:00
20220303203437_remove_media_attachments_changed_from_status_edits.rb Change how changes to media attachments are stored for edits (#17696) 2022-03-09 09:06:17 +01:00