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.

Claire 50b430d9a2 Merge branch 'main' into glitch-soc/merge-upstream ... - `app/views/statuses/_simple_status.html.haml`: Small markup change in glitch-soc, on a line that has been modified by upstream. Ported upstream changes.		2021-05-07 18:21:59 +02:00
..
activitypub	Prepare Mastodon for Rails 6 (#15911)	2021-03-17 10:09:55 +01:00
admin	Add Ruby 3.0 support (#16046)	2021-05-06 14:22:54 +02:00
api	Merge branch 'main' into glitch-soc/merge-upstream	2021-04-20 12:17:14 +02:00
auth	Change confirmations controller to redirect to / for approved users (#16151)	2021-05-03 15:45:19 +02:00
concerns	Fix cache_collection crashing when given an empty collection (#15921)	2021-03-18 00:41:32 +01:00
oauth	Bump doorkeeper from 5.3.3 to 5.4.0 (#13733)	2020-05-12 15:25:33 +02:00
settings	Merge branch 'main' into glitch-soc/merge-upstream	2021-03-24 10:53:50 +01:00
well_known	Prepare Mastodon for Rails 6 (#15911)	2021-03-17 10:09:55 +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	Prepare Mastodon for Rails 6 (#15911)	2021-03-17 10:09:55 +01:00
application_controller_spec.rb	Merge branch 'main' into glitch-soc/merge-upstream	2021-03-24 10:53:50 +01:00
authorize_interactions_controller_spec.rb	Change ResolveAccountService's handling of skip_webfinger (#15750)	2021-02-24 06:32:13 +01:00
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_controller_spec.rb	Fix glitch-soc-specific health check spec	2021-04-05 15:21:38 +02: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	…