b28ce2424c
Conflicts: - `app/helpers/application_helper.rb`: Upstream added a helper where glitch-soc had its own, not really a conflict. Added upstream's helper. - `lib/sanitize_ext/sanitize_config.rb`: Upstream renamed a constant that was used slightly differently in glitch-soc. Renamed it as upstream did. |
||
|---|---|---|
| .. | ||
| build-container-image.yml | ||
| build-nightly.yml | ||
| build-push-pr.yml | ||
| build-releases.yml | ||
| build-security.yml | ||
| bundler-audit.yml | ||
| check-i18n.yml | ||
| codeql.yml | ||
| crowdin-download-stable.yml | ||
| crowdin-download.yml | ||
| crowdin-upload.yml | ||
| format-check.yml | ||
| haml-lint-problem-matcher.json | ||
| lint-css.yml | ||
| lint-haml.yml | ||
| lint-js.yml | ||
| lint-ruby.yml | ||
| rebase-needed.yml | ||
| test-image-build.yml | ||
| test-js.yml | ||
| test-migrations.yml | ||
| test-ruby.yml | ||