Claire 5fd8780b14 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `package.json`: Not really a conflict, upstream updated a dependency textually adjacent to a glitch-soc-only one. Updated the dependency as upstream did.		2022-05-11 09:37:48 +02:00
..
activitypub	Merge branch 'main' into glitch-soc/merge-upstream	2022-03-22 17:00:38 +01:00
admin	Merge branch 'main' into glitch-soc/merge-upstream	2022-04-28 18:16:42 +02:00
api	Merge branch 'main' into glitch-soc/merge-upstream	2022-05-03 10:16:49 +02:00
auth	Merge branch 'main' into glitch-soc/merge-upstream	2022-04-06 21:10:23 +02:00
concerns	Merge branch 'main' into glitch-soc/merge-upstream	2022-04-06 21:10:23 +02:00
disputes	Merge branch 'main' into glitch-soc/merge-upstream	2022-03-02 18:02:48 +01:00
oauth	Merge branch 'main' into glitch-soc/merge-upstream	2022-05-01 16:52:27 +02:00
settings	Merge branch 'main' into glitch-soc/merge-upstream	2022-04-28 18:16:42 +02:00
well_known	Remove Keybase integration (#17045)	2021-11-26 05:58:18 +01:00
about_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2021-02-22 15:23:46 +01:00
account_follow_controller.rb
account_unfollow_controller.rb
accounts_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-05-11 09:37:48 +02:00
application_controller.rb	Move glitch-soc-specific theming methods to ThemingConcern	2022-02-05 10:58:51 +01:00
authorize_interactions_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-05-01 16:52:27 +02:00
custom_css_controller.rb	Remove set-cookie header on custom.css (#16314)	2021-05-30 17:57:47 +02:00
directories_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2021-05-07 18:21:59 +02:00
emojis_controller.rb
filters_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-11-03 17:28:54 +01:00
follower_accounts_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-03-08 20:22:54 +01:00
following_accounts_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-05-01 16:52:27 +02:00
health_controller.rb	Change health check (#15988)	2021-04-03 02:39:04 +02:00
home_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2021-09-26 18:28:59 +02:00
instance_actors_controller.rb	Fix instance actor not being dereferenceable (#17457)	2022-02-06 15:31:03 +01:00
intents_controller.rb
invites_controller.rb
manifests_controller.rb
media_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2021-10-13 15:50:24 +02:00
media_proxy_controller.rb	Fix single Redis connection being used across all threads (#18135)	2022-04-28 17:47:34 +02:00
public_timelines_controller.rb
relationships_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-11-12 22:13:57 +01:00
remote_follow_controller.rb
remote_interaction_controller.rb
shares_controller.rb
statuses_cleanup_controller.rb	Fix account statuses cleanup settings controller for glitch-soc's theming system	2021-08-09 23:28:06 +02:00
statuses_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2021-05-07 18:21:59 +02:00
tags_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-05-11 09:37:48 +02:00