Fix `body_classes` test for glitch-soc
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.
Fix thread lines in right-to-left locales (#24714)
Fix wrong classes `audio` and `video` instead of `audio-player` and `video-player` in CSS (#24711)
Change logged-out WebUI HTML pages to be cached for a few seconds (#24708)
Add default post text to onboarding flow in web UI (#24705)
Fix /api/v1/custom_emojis being cached even when unauthenticated API access is disallowed (#24665)
Change logo version in header based on screen size in web UI (#24707)
Remove display name input from sign-up form (#24704)
Change label from "For you" to "People" on explore screen in web UI (#24706)
Fix refering to unused `preview-card` CSS class instead of `status-card` (#24696)
Remove duplicate react helper method definitions (#24700)
Unignore stuck Dependabot updates (#24670)
Bump tesseract.js from 2.1.1 to 2.1.5 (#19084)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Fix `tootctl accounts create --reattach --force` not working with confirmed accounts (#24680)
Drop EOL Ruby 2.7 (#24237)
Fix preview cards layout in thread view (#24677)
New Crowdin updates (#24617)
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>