You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Claire 3160e050a9 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/helpers/accounts_helper.rb`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change. - `app/views/accounts/_header.html.haml`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change. - `app/views/directories/index.html.haml`: Conflict due to upstream changing how followers count is displayed while we have an option to hide followers count. Ported upstream change.		3 years ago
..
activitypub	Fix anonymous access to outbox not being cached by the reverse proxy (#16458)	3 years ago
admin	Add ability to skip sign-in token authentication for specific users (#16427)	3 years ago
api	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
auth	Change confirmations controller to redirect to / for approved users (#16151)	4 years ago
concerns	Fix cache_collection crashing when given an empty collection (#15921)	4 years ago
oauth	…
settings	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
well_known	Fix anonymous access to outbox not being cached by the reverse proxy (#16458)	3 years ago
about_controller_spec.rb	…
account_follow_controller_spec.rb	Add support for reversible suspensions through ActivityPub (#14989)	4 years ago
account_unfollow_controller_spec.rb	Add support for reversible suspensions through ActivityPub (#14989)	4 years ago
accounts_controller_spec.rb	Prepare Mastodon for Rails 6 (#15911)	4 years ago
application_controller_spec.rb	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
authorize_interactions_controller_spec.rb	Change ResolveAccountService's handling of skip_webfinger (#15750)	4 years ago
emojis_controller_spec.rb	…
follower_accounts_controller_spec.rb	Fix serialization of followers/following counts when user hides their network (#16418)	3 years ago
following_accounts_controller_spec.rb	Fix serialization of followers/following counts when user hides their network (#16418)	3 years ago
health_controller_spec.rb	Fix glitch-soc-specific health check spec	4 years ago
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)	4 years ago
media_proxy_controller_spec.rb	Fix media attachments enumeration (#14254)	4 years ago
relationships_controller_spec.rb	Remove PubSubHubbub-related columns from accounts table (#16170)	4 years ago
remote_follow_controller_spec.rb	Add support for reversible suspensions through ActivityPub (#14989)	4 years ago
remote_interaction_controller_spec.rb	…
shares_controller_spec.rb	…
statuses_controller_spec.rb	Add support for reversible suspensions through ActivityPub (#14989)	4 years ago
tags_controller_spec.rb	…