Claire eee36267d6 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/mastodon/locales/ja.json`: Upstream change too close to a glitch-soc-specific string. The glitch-soc-specific string should not have been in this file, so it has been moved to `app/javascript/flavours/glitch/locales/ja.js`. - `app/javascript/packs/public.js`: Upstream refactored a part, that as usual is split and duplicated in various pack files. Updated those pack files accordingly. - `app/views/layouts/application.html.haml`: Upstream fixed custom.css path in a different way than we did, went with upstream's change.		2022-10-30 18:15:28 +01:00
..
activitypub	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-02 18:46:22 +02:00
admin	Fix domain block export not exporting blocks with only media rejection	2022-10-28 20:14:25 +02:00
api	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-30 18:15:28 +01:00
auth	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-28 19:23:58 +02:00
concerns	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-28 19:23:58 +02:00
disputes	Merge branch 'main' into glitch-soc/merge-upstream	2022-03-02 18:02:48 +01:00
filters	Fix error when accessing /filters/:id/statuses on glitch-soc (#1837)	2022-08-31 11:55:27 +02: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-10-28 19:23:58 +02:00
well_known	Remove Keybase integration (#17045)	2021-11-26 05:58:18 +01:00
about_controller.rb	Change public accounts pages to mount the web UI (#19319)	2022-10-20 14:35:29 +02:00
accounts_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-28 19:23:58 +02:00
application_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-07-05 09:33:44 +02: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	Add customizable user roles (#18641)	2022-07-05 02:41:40 +02:00
emojis_controller.rb
filters_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-08-25 05:07:39 +02:00
follower_accounts_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-28 19:23:58 +02:00
following_accounts_controller.rb	Change public accounts pages to mount the web UI (#19319)	2022-10-20 14:35:29 +02:00
health_controller.rb	Change health check (#15988)	2021-04-03 02:39:04 +02:00
home_controller.rb	Change public accounts pages to mount the web UI (#19319)	2022-10-20 14:35:29 +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	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-19 21:49:35 +02:00
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	Refactor how Redis locks are created (#18400)	2022-05-13 00:02:35 +02:00
privacy_controller.rb	Change public accounts pages to mount the web UI (#19319)	2022-10-20 14:35:29 +02:00
relationships_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	2022-10-28 19:23:58 +02:00
tags_controller.rb	Change public accounts pages to mount the web UI (#19319)	2022-10-20 14:35:29 +02:00