Claire f15ded319f 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
..
account_counters_spec.rb	Enable Style/FrozenStringLiteralComment for specs (#23790)	2023-02-22 09:55:31 +09:00
account_finder_concern_spec.rb	Handle nil and blank cases in Account finders (#3500)	2017-06-01 08:20:36 -04:00
account_interactions_spec.rb	Merge branch 'main' into glitch-soc/merge-upstream	2023-02-25 14:00:40 +01:00
remotable_spec.rb	Enable Rubocop RSpec/NotToNot (#23723)	2023-02-20 02:33:27 +01:00
status_threading_concern_spec.rb	Record account suspend/silence time and keep track of domain blocks (#10660)	2019-05-14 19:05:02 +02:00