mastodon/spec/models
Thibaut Girka 980c004f06 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `Gemfile.lock`:
  No real conflict, glitch-soc-only dependency (redcarpet) too close to an
  upstream one (rdf-normalize)
- `README.md`:
  we have different READMEs, discarded upstream's changes
- `app/views/admin/custom_emojis/index.html.haml`:
  No real conflict, different context because of glitch-soc theming
- `lib/mastodon/statuses_cli.rb`:
  Upstream added code to keep bookmarked statuses, we were already doing so
  with slightly different code. Discarded upstream's changes.
- `package.json`:
  No real conflict, glitch-soc-only dependency (favico.js) too close to
  an upstream one
2020-01-12 15:57:34 +01:00
..
admin Add option to include reported statuses in warning e-mail (#11639) 2019-08-23 22:37:23 +02:00
concerns Merge branch 'master' into glitch-soc/merge-upstream 2019-10-10 17:26:08 +02:00
form Change deletes to preserve soft-deleted statuses in unresolved reports (#11805) 2019-09-11 16:32:44 +02:00
web
account_alias_spec.rb Add account migration UI (#11846) 2019-09-19 20:58:19 +02:00
account_conversation_spec.rb
account_domain_block_spec.rb
account_filter_spec.rb
account_migration_spec.rb Add account migration UI (#11846) 2019-09-19 20:58:19 +02:00
account_moderation_note_spec.rb
account_spec.rb Remove dependency on OStatus2 gem (#12822) 2020-01-11 21:36:53 +01:00
account_stat_spec.rb Fix account counters being overwritten by parallel writes (#12045) 2019-10-02 04:59:37 +02:00
account_tag_stat_spec.rb
backup_spec.rb
block_spec.rb
conversation_mute_spec.rb
conversation_spec.rb Revert "Remove conversation URI (#11423)" (#11424) 2019-07-28 17:47:37 +02:00
custom_emoji_category_spec.rb Add categories for custom emojis (#11196) 2019-06-28 15:54:10 +02:00
custom_emoji_filter_spec.rb
custom_emoji_spec.rb
custom_filter_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
export_spec.rb
favourite_spec.rb
featured_tag_spec.rb
follow_request_spec.rb
follow_spec.rb
home_feed_spec.rb Fix performance of home feed regeneration (#12084) 2019-10-06 22:11:17 +02:00
identity_spec.rb
import_spec.rb
invite_spec.rb Fix invites not being disabled upon account suspension (#11412) 2019-07-26 18:55:33 +02:00
list_account_spec.rb
list_spec.rb
marker_spec.rb Add timeline read markers API (#11762) 2019-09-06 13:55:51 +02:00
media_attachment_spec.rb Fix base64-encoded file uploads not being possible (#12748) 2020-01-04 01:54:07 +01:00
mention_spec.rb
mute_spec.rb
notification_spec.rb Add follow_request notification type (#12198) 2019-12-01 17:25:29 +01:00
poll_spec.rb
poll_vote_spec.rb Implement pending tests (#11415) 2019-07-27 10:24:26 +02:00
preview_card_spec.rb
relay_spec.rb
remote_follow_spec.rb Fix uncaught domain normalization error in remote follow (#11703) 2019-08-30 02:19:17 +02:00
report_filter_spec.rb
report_spec.rb Bump faker from 1.9.6 to 2.1.0 and update faker api (#11489) 2019-08-06 15:33:03 +02:00
scheduled_status_spec.rb
session_activation_spec.rb
setting_spec.rb
site_upload_spec.rb
status_pin_spec.rb
status_spec.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-01-12 15:57:34 +01:00
status_stat_spec.rb
tag_spec.rb Fix hashtags being split by ZWNJ character (#11821) 2019-09-13 16:01:26 +02:00
trending_tags_spec.rb Change trending hashtags to not disappear instantly after midnight (#11712) 2019-09-02 18:11:13 +02:00
user_invite_request_spec.rb
user_spec.rb Change unconfirmed user login behaviour (#11375) 2019-07-22 10:48:50 +02:00