mirror of
https://github.com/funamitech/mastodon
synced 2024-11-23 22:57:05 +09:00
941a9df28a
Conflicts: - `.github/workflows/build-nightly.yml`: Upstream changed how the nightly builds are versioned, the conflict is because glitch-soc modified adjacent lines relative to the docker repositories the images are pushed to. Applied upstream's changes. - `app/views/settings/preferences/notifications/show.html.haml`: Upstream moved some settings around. Glitch-soc had more settings. Applied upstream's changes, moving glitch-soc's extra settings accordingly. |
||
|---|---|---|
| .. | ||
| 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 | ||