mirror of
https://github.com/funamitech/mastodon
synced 2024-11-23 22:57:05 +09:00
3c7dbf3a16
Conflicts: - `.github/workflows/build-nightly.yml`: Upstream changed the environment variables used for defining the version number. This change occurs close to lines that were modified in glitch-soc to account for the different repositories to push to. Ported upstream changes. - `.github/workflows/build-push-pr.yml`: Upstream changed the environment variables used for defining the version number. This change occurs close to lines that were modified in glitch-soc to account for the different repositories to push to. Ported upstream changes. - `lib/mastodon/version.rb`: Upstream changed how the version string is built from environment variables. Adapted the logic to account for the `+glitch` in glitch-soc. |
||
|---|---|---|
| .. | ||
| 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 | ||