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.		2021-07-08 16:17:19 +02:00
..
activitypub	Fix anonymous access to outbox not being cached by the reverse proxy (#16458)	2021-07-03 21:13:47 +02:00
admin	Add ability to skip sign-in token authentication for specific users (#16427)	2021-07-08 05:31:28 +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	Fix anonymous access to outbox not being cached by the reverse proxy (#16458)	2021-07-03 21:13:47 +02:00
about_controller_spec.rb
account_follow_controller_spec.rb
account_unfollow_controller_spec.rb
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	Fix serialization of followers/following counts when user hides their network (#16418)	2021-06-21 20:14:47 +02:00
following_accounts_controller_spec.rb	Fix serialization of followers/following counts when user hides their network (#16418)	2021-06-21 20:14:47 +02:00
health_controller_spec.rb	Fix glitch-soc-specific health check spec	2021-04-05 15:21:38 +02:00
home_controller_spec.rb
intents_controller_spec.rb
invites_controller_spec.rb
manifests_controller_spec.rb	Use raw status code on have_http_status (#7214)	2018-04-21 21:35:07 +02:00
media_controller_spec.rb
media_proxy_controller_spec.rb
relationships_controller_spec.rb	Remove PubSubHubbub-related columns from accounts table (#16170)	2021-05-07 19:32:58 +02:00
remote_follow_controller_spec.rb
remote_interaction_controller_spec.rb
shares_controller_spec.rb
statuses_controller_spec.rb
tags_controller_spec.rb