This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
mastodon/spec/controllers
Thibaut Girka 0437d70628 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/follower_accounts_controller.rb`:
  Conflict due to upstream changing suspension logic while
  glitch-soc has an extra option to hide followers count.
  Ported upstream changes.
2020-11-08 14:20:35 +01:00
..
activitypub Add support for reversible suspensions through ActivityPub (#14989) 2020-11-08 00:28:39 +01:00
admin Add WebAuthn as an alternative 2FA method (#14466) 2020-08-24 16:46:27 +02:00
api Merge branch 'master' into glitch-soc/merge-upstream 2020-11-08 14:20:35 +01:00
auth Change account suspensions to be reversible by default (#14726) 2020-09-15 14:37:58 +02:00
concerns Change account suspensions to be reversible by default (#14726) 2020-09-15 14:37:58 +02:00
oauth
settings Merge branch 'master' into glitch-soc/merge-upstream 2020-09-28 14:13:30 +02:00
well_known Add support for reversible suspensions through ActivityPub (#14989) 2020-11-08 00:28:39 +01:00
about_controller_spec.rb
account_follow_controller_spec.rb Add support for reversible suspensions through ActivityPub (#14989) 2020-11-08 00:28:39 +01:00
account_unfollow_controller_spec.rb Add support for reversible suspensions through ActivityPub (#14989) 2020-11-08 00:28:39 +01:00
accounts_controller_spec.rb Add support for reversible suspensions through ActivityPub (#14989) 2020-11-08 00:28:39 +01:00
application_controller_spec.rb
authorize_interactions_controller_spec.rb
emojis_controller_spec.rb
follower_accounts_controller_spec.rb Add support for reversible suspensions through ActivityPub (#14989) 2020-11-08 00:28:39 +01:00
following_accounts_controller_spec.rb Add support for reversible suspensions through ActivityPub (#14989) 2020-11-08 00:28:39 +01:00
health_check_controller_spec.rb
home_controller_spec.rb
intents_controller_spec.rb
invites_controller_spec.rb
manifests_controller_spec.rb
media_controller_spec.rb Fix media attachments enumeration (#14254) 2020-07-07 15:26:51 +02:00
media_proxy_controller_spec.rb Fix media attachments enumeration (#14254) 2020-07-07 15:26:51 +02:00
relationships_controller_spec.rb
remote_follow_controller_spec.rb Add support for reversible suspensions through ActivityPub (#14989) 2020-11-08 00:28:39 +01:00
remote_interaction_controller_spec.rb
shares_controller_spec.rb
statuses_controller_spec.rb Add support for reversible suspensions through ActivityPub (#14989) 2020-11-08 00:28:39 +01:00
tags_controller_spec.rb