mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-24 09:04:00 -05: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. |
||
|---|---|---|
| .. | ||
| controllers | ||
| fabricators | ||
| features | ||
| fixtures | ||
| helpers | ||
| lib | ||
| mailers | ||
| models | ||
| policies | ||
| presenters | ||
| requests | ||
| routing | ||
| serializers/activitypub | ||
| services | ||
| support | ||
| validators | ||
| views | ||
| workers | ||
| rails_helper.rb | ||
| spec_helper.rb | ||