ab152ebed4
Conflicts: - `app/models/status.rb`: Upstream refactored `visibility` handling to a concern, while glitch-soc had custom code adjacent to some of the changed lines. Applied upstream's changes. - `lib/mastodon/version.rb`: Upstream moved some definitions to `config/mastodon.yml`, while glitch-soc's default github repository had been modified. Applied upstream's changes and updated `config/mastodon.yml` accordingly. |
||
|---|---|---|
| .. | ||
| 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 | ||