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
..
access_token_tracking_concern.rb	Change authorized applications page (#17656)	3 years ago
account_controller_concern.rb	Move link header setting to after_action (#24251)	2 years ago
account_owned_concern.rb	Change public profile pages to be disabled for unconfirmed users (#17385)	3 years ago
accountable_concern.rb	Add audit log entries for user roles (#19040)	2 years ago
admin_export_controller_concern.rb	Change domain block CSV parsing to be more robust and handle more lists (#21470)	2 years ago
api_caching_concern.rb	Change unauthenticated responses to be cached in REST API (#24348)	2 years ago
authorization.rb	Bump pundit from 2.1.1 to 2.2.0 (#17543)	3 years ago
cache_concern.rb	Fix /api/v1/instance/domain_blocks being unconditionally cached (#24662)	2 years ago
captcha_concern.rb	Change CAPTCHA handling to be only on email verification	3 years ago
challengable_concern.rb	Bump rubocop from 0.86.0 to 0.88.0 (#14412)	4 years ago
export_controller_concern.rb	Refactor settings controllers (#14767)	4 years ago
localized.rb	Add trending statuses (#17431)	3 years ago
rate_limit_headers.rb	Autofix Rubocop Style/RedundantBegin (#23703)	2 years ago
registration_spam_concern.rb	Add honeypot fields and minimum fill-out time for sign-up form (#15276)	4 years ago
session_tracking_concern.rb	Autofix Rubocop remaining Layout rules (#23679)	2 years ago
signature_authentication.rb	Allow retrieval of private statuses (single or in outbox) using HTTP signatures (#6225)	7 years ago
signature_verification.rb	Autofix Rubocop Style/RedundantArgument (#23798)	2 years ago
theming_concern.rb	Add support for multiple source files per pack	3 years ago
two_factor_authentication_concern.rb	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
user_tracking_concern.rb	Change authorized applications page (#17656)	3 years ago
web_app_controller_concern.rb	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago