You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Claire 12b935fadf Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.github/dependabot.yml`: Updated upstream, removed in glitch-soc to disable noise. Kept removed. - `CODE_OF_CONDUCT.md`: Upstream updated to a new version of the covenant, but I have not read it yet, so kept unchanged. - `Gemfile.lock`: Not a real conflict, one upstream dependency updated textually too close to the glitch-soc only `hcaptcha` dependency. Applied upstream changes. - `app/controllers/admin/base_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/application_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/disputes/base_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/relationships_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/statuses_cleanup_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/helpers/application_helper.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/javascript/mastodon/features/compose/components/compose_form.jsx`: Upstream added a highlight animation for onboarding, while we changed the max character limit. Applied our local changes on top of upstream's new version. - `app/views/layouts/application.html.haml`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `stylelint.config.js`: Upstream added ignore paths, glitch-soc had extra ignore paths. Added the same paths as upstream.		2 years ago
..
_theme.html.haml	Fix glitch-soc HAML linting issues (#2166)	2 years ago
admin.html.haml	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
application.html.haml	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
auth.html.haml	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
embedded.html.haml	Fix glitch-soc HAML linting issues (#2166)	2 years ago
error.html.haml	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
mailer.html.haml	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
mailer.text.erb	…
modal.html.haml	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
plain_mailer.html.haml	…