cb70bb8665
Conflicts: - `app/views/admin/settings/appearance/show.html.haml`: Upstream enforced an uniform code style around lambdas, and glitch-soc had a different lambda due to its theming system. Applied the same code style changes. - `app/views/settings/preferences/appearance/show.html.haml`: Upstream enforced an uniform code style around lambdas, and glitch-soc removed some code just after the lambda. Applied the same code style changes. |
||
---|---|---|
.. | ||
build-image.yml | ||
build-nightly.yml | ||
bundler-audit.yml | ||
check-i18n.yml | ||
codeql.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-js.yml | ||
test-migrations-one-step.yml | ||
test-migrations-two-step.yml | ||
test-ruby.yml |