mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-13 14:45:12 +01:00
Code Issues Projects Releases Wiki Activity
24e83246f9
mastodon/db/post_migrate
History
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 Add post-deployment migration system (#8182) 2018-08-13 18:17:20 +02:00
20180813113448_copy_status_stats_cleanup.rb Move status counters to separate table, count replies (#8104) 2018-08-14 19:19:32 +02:00
20180813160548_post_migrate_filters.rb Split custom filter migration script using the post-deployment migration system 2018-08-16 20:30:09 +02:00
20181116184611_copy_account_stats_cleanup.rb Extract counters from accounts table to account_stats table (#9295) 2018-11-19 00:43:52 +01:00
20190511152737_remove_suspended_silenced_account_fields.rb Record account suspend/silence time and keep track of domain blocks (#10660) 2019-05-14 19:05:02 +02:00
20190519130537_remove_boosts_widening_audience.rb Revert "Remove conversation URI (#11423)" (#11424) 2019-07-28 17:47:37 +02:00
20190706233204_drop_stream_entries.rb Remove Atom feeds and old URLs in the form of GET /:username/updates/:id (#11247) 2019-07-07 16:16:51 +02:00
20190715031050_drop_subscriptions.rb Remove WebSub subscriptions (#11303) 2019-07-21 04:08:00 +02:00
20190901040524_remove_score_from_tags.rb Change trending hashtags to not disappear instantly after midnight (#11712) 2019-09-02 18:11:13 +02:00
20190927124642_remove_invalid_web_push_subscription.rb Validate Web::PushSubscription (#11971) 2019-09-27 15:24:13 +02:00
20200917193528_migrate_notifications_type.rb Add option to be notified when a followed user posts (#13546) 2020-09-18 17:26:45 +02:00
20200917222734_remove_index_notifications_on_account_activity.rb Add option to be notified when a followed user posts (#13546) 2020-09-18 17:26:45 +02:00
20201017234926_fill_account_suspension_origin.rb Add support for reversible suspensions through ActivityPub (#14989) 2020-11-08 00:28:39 +01:00
20210308133107_remove_subscription_expires_at_from_accounts.rb Remove subscription_expires_at leftover from OStatus (#15857) 2021-03-12 05:25:24 +01:00
20210502233513_drop_account_tag_stats.rb Change trending hashtags to be affected be reblogs (#16164) 2021-05-07 14:33:43 +02:00
20210507001928_remove_hub_url_from_accounts.rb Remove PubSubHubbub-related columns from accounts table (#16170) 2021-05-07 19:32:58 +02:00
20210526193025_remove_lock_version_from_account_stats.rb Fix account deletion sometimes failing because of optimistic locks (#16317) 2021-06-02 17:41:25 +02:00
20210616214135_remove_current_sign_in_ip_from_users.rb Remove IP tracking columns from users table (#16409) 2022-01-16 13:23:50 +01:00
20210808071221_clear_orphaned_account_notes.rb Fix owned account notes not being deleted when an account is deleted (#16579) 2021-08-08 15:29:57 +02:00
20211126000907_drop_account_identity_proofs.rb Remove Keybase integration (#17045) 2021-11-26 05:58:18 +01:00
20220109213908_remove_action_taken_from_reports.rb Add notifications for statuses deleted by moderators (#17204) 2022-01-17 09:41:33 +01:00
20220118183010_remove_index_users_on_remember_token.rb Remove leftover database columns from Devise::Models::Rememberable (#17191) 2022-01-23 15:46:30 +01:00
20220118183123_remove_rememberable_from_users.rb Remove leftover database columns from Devise::Models::Rememberable (#17191) 2022-01-23 15:46:30 +01:00
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