mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-17 20:32:56 +00:00
0092fe50ac
Conflicts: - `.github/workflows/build-image.yml`: Upstream entirely refactored this, while we changed the docker repository to upload to and disabled the “latest” tag. Applied the repository change to `.github/workflows/build-*.yml`, as well as disabling native ARMv64 builds. - `README.md`: We have a completely different README. Kept ours. - `app/views/admin/settings/shared/_links.html.haml`: Upstream refactored, we had an extra item. Refactored as upstream did. - `spec/controllers/api/v1/timelines/public_controller_spec.rb`: Upstream deleted this file, to be replaced by a request spec at `spec/requests/api/v1/timelines/public_spec.rb`. We had an extra bit about enabling the public timelines because we have different defaults than upstream. Moved that bit to `spec/requests/api/v1/timelines/public_spec.rb` |
||
|---|---|---|
| .. | ||
| build-container-image.yml | ||
| build-nightly.yml | ||
| build-push-pr.yml | ||
| build-releases.yml | ||
| bundler-audit.yml | ||
| check-i18n.yml | ||
| codeql.yml | ||
| crowdin-download.yml | ||
| crowdin-upload.yml | ||
| haml-lint-problem-matcher.json | ||
| lint-css.yml | ||
| lint-haml.yml | ||
| lint-js.yml | ||
| lint-json.yml | ||
| lint-md.yml | ||
| lint-ruby.yml | ||
| lint-yml.yml | ||
| rebase-needed.yml | ||
| test-image-build.yml | ||
| test-js.yml | ||
| test-migrations-one-step.yml | ||
| test-migrations-two-step.yml | ||
| test-ruby.yml | ||