alex
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
mastodon/spec/controllers
History
Thibaut Girka 48f0f3ffee Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `.github/ISSUE_TEMPLATE/bug_report.md`:
  Upstream added the `bug` label to bug reports.
  Did the same.
- `app/services/fan_out_on_write_service.rb`:
  Upstream put DMs back into timelines, glitch-soc was already doing it.
  Ignored upstream changes.
 		2020-11-20 13:27:48 +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 Fix 2FA/sign-in token sessions being valid after password change (#14802) 2020-11-12 23:05:01 +01:00
concerns Change account suspensions to be reversible by default (#14726) 2020-09-15 14:37:58 +02:00
oauth Bump doorkeeper from 5.3.3 to 5.4.0 (#13733) 2020-05-12 15:25:33 +02:00
settings Merge branch 'master' into glitch-soc/merge-upstream 2020-11-20 13:27:48 +01: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 Merge branch 'master' into glitch-soc/merge-upstream 2019-11-20 15:36:09 +01:00
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 Add test for health_check endpoint 2020-02-10 20:04:41 +01:00
home_controller_spec.rb Fix blurhash and autoplay not working on public pages (#11585) 2019-08-16 19:15:05 +02:00
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 Fix blurhash and autoplay not working on public pages (#11585) 2019-08-16 19:15:05 +02:00
statuses_controller_spec.rb Add support for reversible suspensions through ActivityPub (#14989) 2020-11-08 00:28:39 +01:00
tags_controller_spec.rb
…