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. |
||
|---|---|---|
| .. | ||
| environments | ||
| imagemagick | ||
| initializers | ||
| locales | ||
| locales-glitch | ||
| routes | ||
| templates | ||
| webpack | ||
| application.rb | ||
| boot.rb | ||
| brakeman.yml | ||
| captcha.yml | ||
| database.yml | ||
| environment.rb | ||
| formatjs-formatter.js | ||
| i18n-tasks.yml | ||
| mastodon.yml | ||
| navigation.rb | ||
| pghero.yml | ||
| puma.rb | ||
| roles.yml | ||
| routes.rb | ||
| settings.yml | ||
| sidekiq.yml | ||
| translation.yml | ||
| webpacker.yml | ||