Claire 4ed09276d5 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.prettierignore`: Upstream added a line at the end of the file, while glitch-soc had its own extra lines. Took upstream's change. - `CONTRIBUTING.md`: We have our custom CONTRIBUTING.md quoting upstream. Upstream made changes. Ported upstream changes. - `app/controllers/application_controller.rb`: Upstream made code style changes in a method that is entirely replaced in glitch-soc. Ignored the change. - `app/models/account.rb`: Code style changes textually close to glitch-soc-specific changes. Ported upstream changes. - `lib/sanitize_ext/sanitize_config.rb`: Upstream code style changes. Ignored them.		2023-02-25 14:00:40 +01:00
..
activitypub	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-02 18:46:22 +02:00
admin	Merge branch 'main' into glitch-soc/merge-upstream	2023-02-19 10:42:55 +01:00
api	Merge branch 'main' into glitch-soc/merge-upstream	2023-02-25 14:00:40 +01:00
auth	Merge branch 'main' into glitch-soc/merge-upstream	2023-02-25 14:00:40 +01:00
concerns	Merge branch 'main' into glitch-soc/merge-upstream	2023-02-25 14:00:40 +01:00
disputes	Merge branch 'main' into glitch-soc/merge-upstream	2022-03-02 18:02:48 +01:00
filters	Merge branch 'main' into glitch-soc/merge-upstream	2023-02-19 10:42:55 +01:00
oauth	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-17 21:56:05 +01:00
settings	Merge branch 'main' into glitch-soc/merge-upstream	2023-02-25 14:00:40 +01: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-11-17 12:01:37 +01:00
application_controller.rb	Autofix Rubocop remaining Layout rules (#23679)	2023-02-20 06:58:28 +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	Add customizable user roles (#18641)	2022-07-05 02:41:40 +02:00
emojis_controller.rb	Add (back) rails-level JSON caching (#11333)	2019-07-21 22:32:16 +02:00
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-12-15 20:25:25 +01:00
following_accounts_controller.rb	Fix single name variables on controller folder (#20092)	2022-12-15 17:11:58 +01: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	Refactor controllers for statuses, accounts, and more (#11249)	2019-07-08 12:03:45 +02:00
invites_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-19 21:49:35 +02:00
manifests_controller.rb	Fix redirecting non-functional accounts on public pages (#11978)	2019-09-28 01:33:27 +02:00
media_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2023-02-25 14:00:40 +01: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	Merge branch 'master' into glitch-soc/merge-upstream	2020-11-12 22:13:57 +01:00
shares_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-08-19 21:49:35 +02:00
statuses_cleanup_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-17 12:01:37 +01:00
statuses_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-12-15 20:25:25 +01:00
tags_controller.rb	Autofix Rubocop Style/TrailingCommaInArguments (#23694)	2023-02-18 12:39:58 +01:00