mirror of
https://github.com/funamitech/mastodon
synced 2024-12-02 08:48:39 +09:00
dae5e446fe
Conflicts: - `Gemfile`: We updated httplog in a separate commit. Took upstream's change which updated it further. - `Gemfile.lock`: We updated httplog in a separate commit. Took upstream's change which updated it further. - `app/lib/sanitize_config.rb`: Upstream added better unsupported link stripping, while we had different sanitizing configs. Took only upstream's link stripping code. - `config/locales/simple_form.pl.yml`: Strings unused in glitch-soc had been removed from glitch-soc, reintroduced them even if they are not useful, to reduce the risk of later merge conflicts. |
||
|---|---|---|
| .. | ||
| environments | ||
| initializers | ||
| locales | ||
| webpack | ||
| application.rb | ||
| boot.rb | ||
| brakeman.ignore | ||
| database.yml | ||
| deploy.rb | ||
| environment.rb | ||
| i18n-tasks.yml | ||
| navigation.rb | ||
| pghero.yml | ||
| puma.rb | ||
| routes.rb | ||
| secrets.yml | ||
| settings.yml | ||
| sidekiq.yml | ||
| webpacker.yml | ||