Claire 01d6f7529f Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream added a link to the roadmap, but we have a completely different README. Kept ours. - `app/models/media_attachment.rb`: Upstream upped media attachment limits. Updated the default according to upstream's. - `db/migrate/20180831171112_create_bookmarks.rb`: Upstream changed the migration compatibility level. Did so too. - `config/initializers/content_security_policy.rb`: Upstream refactored this file but we have a different version. Kept our version. - `app/controllers/settings/preferences_controller.rb`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. The file does not directly references individual settings anymore. Applied upstream changes. - `app/lib/user_settings_decorator.rb`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. The file got removed entirely. Removed it as well. - `app/models/user.rb`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. References to individual settings have been removed from the file. Removed them as well. - `app/views/settings/preferences/appearance/show.html.haml`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. Applied upstream's changes and ported ours back. - `app/views/settings/preferences/notifications/show.html.haml`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. Applied upstream's changes and ported ours back. - `app/views/settings/preferences/other/show.html.haml`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. Applied upstream's changes and ported ours back. - `config/settings.yml`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. In particular, upstream removed user-specific and unused settings. Did the same in glitch-soc. - `spec/controllers/application_controller_spec.rb`: Conflicts due to glitch-soc's theming system. Mostly kept our version, as upstream messed up the tests.		2023-03-31 21:30:27 +02:00
..
build-image.yml	Fix docker images not being pushed (#2143)	2023-03-23 10:15:41 +01:00
check-i18n.yml	Check for missing i18n strings in CI (#23368)	2023-02-18 12:46:44 +01:00
codeql.yml	Run Prettier on YML files (#22345)	2022-12-16 11:11:52 +09:00
haml-lint-problem-matcher.json	Setup haml-lint CI with todo config (#23524)	2023-03-15 04:15:36 +01:00
lint-css.yml	Trigger CI build on .nvmrc change (#23627)	2023-02-16 04:59:45 +01:00
lint-haml.yml	Fix stale apt index in github actions (#24319)	2023-03-30 14:19:33 +02:00
lint-js.yml	Rename JSX files with proper .jsx extension (#23733)	2023-02-20 03:20:59 +01:00
lint-json.yml	Trigger CI build on .nvmrc change (#23627)	2023-02-16 04:59:45 +01:00
lint-md.yml	Fix Markdown files with Prettier and check in CI (#21972)	2023-02-20 07:37:28 +01:00
lint-ruby.yml	Run bundler-audit on PRs (#23514)	2023-02-18 12:49:09 +01:00
lint-yml.yml	Trigger CI build on .nvmrc change (#23627)	2023-02-16 04:59:45 +01:00
rebase-needed.yml	Skip rebase-needed job for i10n branch (#24026)	2023-03-08 19:26:25 +01:00
test-js.yml	Rename JSX files with proper .jsx extension (#23733)	2023-02-20 03:20:59 +01:00
test-migrations-one-step.yml	Fix stale apt index in github actions (#24319)	2023-03-30 14:19:33 +02:00
test-migrations-two-step.yml	Fix stale apt index in github actions (#24319)	2023-03-30 14:19:33 +02:00
test-ruby.yml	Fix stale apt index in github actions (#24319)	2023-03-30 14:19:33 +02:00