mastodon/.github/workflows
Claire d77fbbed73 Merge commit 'f877aa9d70d0d600961989b8e97c0e0ce3ac1db6' into glitch-soc/merge-upstream
Conflicts:
- `.github/dependabot.yml`:
  Upstream made changes, but we had removed it.
  Discarded upstream changes.
- `.rubocop_todo.yml`:
  Upstream regenerated the file, we had some glitch-soc-specific ignores.
- `app/models/account_statuses_filter.rb`:
  Minor upstream code style change where glitch-soc had slightly different code
  due to handling of local-only posts.
  Updated to match upstream's code style.
- `app/models/status.rb`:
  Upstream moved ActiveRecord callback definitions, glitch-soc had an extra one.
  Moved the definitions as upstream did.
- `app/services/backup_service.rb`:
  Upstream rewrote a lot of the backup service, glitch-soc had changes because
  of exporting local-only posts.
  Took upstream changes and added back code to deal with local-only posts.
- `config/routes.rb`:
  Upstream split the file into different files, while glitch-soc had a few
  extra routes.
  Extra routes added to `config/routes/settings.rb`, `config/routes/api.rb`
  and `config/routes/admin.rb`
- `db/schema.rb`:
  Upstream has new migrations, while glitch-soc had an extra migration.
  Updated the expected serial number to match upstream's.
- `lib/mastodon/version.rb`:
  Upstream added support to set version tags from environment variables, while
  glitch-soc has an extra `+glitch` tag.
  Changed the code to support upstream's feature but prepending a `+glitch`.
- `spec/lib/activitypub/activity/create_spec.rb`:
  Minor code style change upstream, while glitch-soc has extra tests due to
  `directMessage` handling.
  Applied upstream's changes while keeping glitch-soc's extra tests.
- `spec/models/concerns/account_interactions_spec.rb`:
  Minor code style change upstream, while glitch-soc has extra tests.
  Applied upstream's changes while keeping glitch-soc's extra tests.
2023-05-08 19:28:21 +02:00
..
build-image.yml Merge commit 'f877aa9d70d0d600961989b8e97c0e0ce3ac1db6' into glitch-soc/merge-upstream 2023-05-08 19:28:21 +02:00
build-nightly.yml Fixed mastodon version injection into containers via github actions (#24873) 2023-05-05 18:58:35 +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
haml-lint-problem-matcher.json Setup haml-lint CI with todo config (#23524) 2023-03-15 04:15:36 +01:00
lint-css.yml
lint-haml.yml Fix stale apt index in github actions (#24319) 2023-03-30 14:19:33 +02:00
lint-js.yml Fail ESLint for Warnings in CI (#24836) 2023-05-04 09:48:50 +02:00
lint-json.yml
lint-md.yml
lint-ruby.yml
lint-yml.yml
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 Add production asset compile (#24839) 2023-05-05 09:06:51 +02:00