mirror of
https://github.com/glitch-soc/mastodon
synced 2025-04-24 22:24:51 +00:00
155dc4bc4b
Conflicts: - `CONTRIBUTING.md`: Upstream changed the file, while we had a different one. Updated the common parts. - `README.md`: Upstream changed the file, while we had a different one. Updated the common parts. - `app/helpers/application_helper.rb`: Upstream added helpers where glitch-soc had extra ones. Added upstream's new helpers. - `app/models/form/admin_settings.rb`: Upstream added some custom handling of one setting, while glitch-soc had additional code. Ported upstream's code. - `lib/mastodon/version.rb`: Upstream moved some things to `config/mastodon.yml`. Did the same. - `spec/requests/api/v1/accounts/credentials_spec.rb`: I don't know honestly. |
||
|---|---|---|
| .. | ||
| 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 | ||