4ed09276d5
Conflicts: - `.prettierignore`: Upstream added a line at the end of the file, while glitch-soc had its own extra lines. Took upstream's change. - `CONTRIBUTING.md`: We have our custom CONTRIBUTING.md quoting upstream. Upstream made changes. Ported upstream changes. - `app/controllers/application_controller.rb`: Upstream made code style changes in a method that is entirely replaced in glitch-soc. Ignored the change. - `app/models/account.rb`: Code style changes textually close to glitch-soc-specific changes. Ported upstream changes. - `lib/sanitize_ext/sanitize_config.rb`: Upstream code style changes. Ignored them. |
||
|---|---|---|
| .. | ||
| attachment_extensions.rb | ||
| blurhash_transcoder.rb | ||
| color_extractor.rb | ||
| gif_transcoder.rb | ||
| image_extractor.rb | ||
| lazy_thumbnail.rb | ||
| response_with_limit_adapter.rb | ||
| transcoder.rb | ||
| type_corrector.rb | ||
| url_generator_extensions.rb | ||