Claire 4ed09276d5 Merge branch 'main' into glitch-soc/merge-upstream ... 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.		2023-02-25 14:00:40 +01:00
..
attachment_extensions.rb	Run rubocop formatting except line length (#23632)	2023-02-18 06:56:20 +09:00
blurhash_transcoder.rb
color_extractor.rb	Autofix Rubocop Style/FormatString (#23743)	2023-02-20 07:58:33 +01:00
gif_transcoder.rb	Enable Rubocop Style/StringConcatenation defaults (#23792)	2023-02-22 09:54:36 +09:00
image_extractor.rb
lazy_thumbnail.rb
response_with_limit_adapter.rb
transcoder.rb
type_corrector.rb	Enable Rubocop Style/StringConcatenation defaults (#23792)	2023-02-22 09:54:36 +09:00
url_generator_extensions.rb