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.		2023-04-29 10:44:56 +02:00
..
account_associations.rb
account_avatar.rb
account_counters.rb
account_finder_concern.rb
account_header.rb
account_interactions.rb	Refactoring relations_map (#24195)	2023-03-21 10:32:58 +01:00
account_merging.rb
attachmentable.rb	Change media upload limits and remove client-side resizing (#23726)	2023-03-25 10:00:03 +01:00
cacheable.rb
domain_materializable.rb
domain_normalizable.rb
expireable.rb
follow_limitable.rb
has_user_settings.rb	Migrate glitch-soc's exclusive user settings	2023-03-31 22:50:57 +02:00
ldap_authenticable.rb	Fix unescaped user input in LDAP query (#24379)	2023-04-04 12:42:38 +02:00
lockable.rb
omniauthable.rb	Drop EOL Ruby 2.7 (#24237)	2023-04-27 01:46:18 +02:00
paginable.rb
pam_authenticable.rb
rate_limitable.rb
redisable.rb
relationship_cacheable.rb
remotable.rb
status_snapshot_concern.rb
status_threading_concern.rb	Refactoring relations_map (#24195)	2023-03-21 10:32:58 +01:00