catstodon/.github/workflows
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
..
build-image.yml Fix docker images not being pushed (#2143) 2023-03-23 10:15:41 +01:00
build-nightly.yml Inf 123 dated nightly containers (#24656) 2023-04-25 23:11:31 +02:00
check-i18n.yml Fix check-i18n when there are missing strings in other languages than english (#24519) 2023-04-12 15:24:30 +02: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 Add typechecking in CI (#24405) 2023-04-04 16:32:08 +02: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 Update Jest testing to include Typescript (#24555) 2023-04-17 17:12:04 +09: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 Drop EOL Ruby 2.7 (#24237) 2023-04-27 01:46:18 +02:00