mastodon-glitch/.github/workflows
Claire 3ef5f62abf Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `.github/workflows/build-image.yml`:
  Upstream switched to pushing to both DockerHub and GitHub Container
  Repository, while glitch-soc was already pushing to the latter only.
  Updated our configuration to be slightly more consistent with upstream's
  naming and styling, but kept our behavior.
- `Gemfile.lock`:
  Updated dependencies textually too close to glitch-soc only hcaptcha
  dependency.
  Updated dependencies as upstream did.
- `README.md`:
  Upstream updated its README, but we have a completely different one.
  Kept our README, though it probably should be reworked at some point.
- `app/views/auth/sessions/two_factor.html.haml`:
  Minor style fix upstream that's on a line glitch-soc removed because
  of its different theming system.
  Kept our file as is.
- `spec/controllers/health_controller_spec.rb`:
  This file apparently did not exist upstream, upstream created it with
  different contents but it is functionally the same.
  Switched to upstream's version of the file.
- `spec/presenters/instance_presenter_spec.rb`:
  Upstream changed the specs around `GITHUB_REPOSITORY`, while glitch-soc
  had its own code because it's a fork and does not have the same default
  source URL.
  Took upstream's change, but with glitch-soc's repo as the default case.
- `yarn.lock`:
  Upstream dependencies textually too close to a glitch-soc only one.
  Updated dependencies as upstream did.
2023-03-15 09:16:10 +01:00
..
build-image.yml Merge branch 'main' into glitch-soc/merge-upstream 2023-03-15 09:16:10 +01:00
check-i18n.yml Check for missing i18n strings in CI (#23368) 2023-02-18 12:46:44 +01: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 Setup haml-lint CI with todo config (#23524) 2023-03-15 04:15:36 +01:00
lint-js.yml Rename JSX files with proper `.jsx` extension (#23733) 2023-02-20 03:20:59 +01: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 Rename JSX files with proper `.jsx` extension (#23733) 2023-02-20 03:20:59 +01:00
test-migrations-one-step.yml Sync CI and Docker Compose image versions (#24053) 2023-03-10 11:10:47 +01:00
test-migrations-two-step.yml Sync CI and Docker Compose image versions (#24053) 2023-03-10 11:10:47 +01:00
test-ruby.yml Sync CI and Docker Compose image versions (#24053) 2023-03-10 11:10:47 +01:00