Claire 9a3d91f629 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/models/concerns/domain_materializable.rb`: Fixed a code style issue upstream in a PR that got merged in glitch-soc earlier. Changed the code to match upstream's.		2022-12-07 09:03:42 +01:00
..
active_record	Remove dependency on pluck_each gem (#16012)	2021-04-12 03:35:58 +02:00
assets	png optimization(loss less) (#19630)	2022-11-01 15:06:52 +01:00
chewy/strategy	…
devise	Fix authentication before 2FA challenge (#11943)	2019-09-24 04:35:36 +02:00
generators	…
json_ld	…
mastodon	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-28 11:33:34 +01:00
paperclip	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-12 13:28:03 +01:00
rails	…
redis	…
sanitize_ext	Fix link sanitization for outgoing text/html and text/markdown toots	2022-04-11 09:06:25 +02:00
simple_navigation	Add customizable user roles (#18641)	2022-07-05 02:41:40 +02:00
tasks	Merge branch 'main' into glitch-soc/merge-upstream	2022-12-07 09:03:42 +01:00
templates	…
terrapin	Add Ruby 3.0 support (#16046)	2021-05-06 14:22:54 +02:00
webpacker	…
cli.rb	…
exceptions.rb	Fix error when passing unknown filter param in REST API (#20626)	2022-11-14 08:06:06 +01:00