mastodon/spec/models
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
..
admin
concerns
trends
web
account_alias_spec.rb
account_conversation_spec.rb Add conversations API (#8832) 2018-10-07 23:44:58 +02:00
account_deletion_request_spec.rb
account_domain_block_spec.rb
account_filter_spec.rb
account_migration_spec.rb
account_moderation_note_spec.rb
account_spec.rb
account_statuses_cleanup_policy_spec.rb Fix some flaky tests that randomly failed because of item ordering (#17509) 2022-02-10 22:00:10 +01:00
account_statuses_filter_spec.rb
announcement_mute_spec.rb
announcement_reaction_spec.rb Add announcements (#12662) 2020-01-23 22:00:13 +01:00
announcement_spec.rb
appeal_spec.rb Add appeals (#17364) 2022-02-14 21:27:53 +01:00
backup_spec.rb
block_spec.rb Cover Block more (#3837) 2017-06-19 11:31:37 +02:00
canonical_email_block_spec.rb Add canonical e-mail blocks for suspended accounts (#16049) 2021-04-17 03:14:25 +02:00
conversation_mute_spec.rb Lint pass (#8876) 2018-10-04 12:36:53 +02:00
conversation_spec.rb
custom_emoji_category_spec.rb
custom_emoji_filter_spec.rb
custom_emoji_spec.rb Make custom emoji domains case insensitive #9351 (#9474) 2018-12-11 05:30:57 +01:00
custom_filter_spec.rb
device_spec.rb
domain_allow_spec.rb Add whitelist mode (#11291) 2019-07-30 11:10:46 +02:00
domain_block_spec.rb Allow blocking TLDs, and fix TLD blocks not being editable (#12805) 2020-01-08 22:42:05 +01:00
email_domain_block_spec.rb
encrypted_message_spec.rb
export_spec.rb
favourite_spec.rb
featured_tag_spec.rb Add featured hashtags to profiles (#9755) 2019-02-04 04:25:59 +01:00
follow_recommendation_suppression_spec.rb Add cold-start follow recommendations (#15945) 2021-04-12 12:37:14 +02:00
follow_request_spec.rb
follow_spec.rb
home_feed_spec.rb
identity_spec.rb Add spec for Identity.find_for_oauth (#9441) 2018-12-06 17:38:49 +09:00
import_spec.rb Fix follow limit preventing re-following of a moved account (#14207) 2020-12-18 09:18:31 +01:00
invite_spec.rb
ip_block_spec.rb
list_account_spec.rb Lint pass (#8876) 2018-10-04 12:36:53 +02:00
list_spec.rb
login_activity_spec.rb
marker_spec.rb
media_attachment_spec.rb
mention_spec.rb
mute_spec.rb
notification_spec.rb
one_time_key_spec.rb
poll_spec.rb
poll_vote_spec.rb
preview_card_spec.rb
public_feed_spec.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-01-28 08:58:32 +01:00
relationship_filter_spec.rb
relay_spec.rb
remote_follow_spec.rb
report_filter_spec.rb
report_spec.rb
rule_spec.rb
scheduled_status_spec.rb
session_activation_spec.rb
setting_spec.rb
site_upload_spec.rb Add a test for SiteUpload#cache_key (#5685) 2017-11-14 20:44:11 +01:00
status_edit_spec.rb Add support for editing for published statuses (#16697) 2022-01-19 22:37:27 +01:00
status_pin_spec.rb
status_spec.rb
status_stat_spec.rb Extract counters from accounts table to account_stats table (#9295) 2018-11-19 00:43:52 +01:00
system_key_spec.rb
tag_feed_spec.rb Merge branch 'main' into glitch-soc/merge-upstream 2021-07-08 16:17:19 +02:00
tag_spec.rb
unavailable_domain_spec.rb
user_invite_request_spec.rb
user_spec.rb
webauthn_credentials_spec.rb