Claire 25a46d9e59 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/styles/fonts/montserrat.scss`: Code style changes upstream, path changes in glitch-soc. Applied upstream's code style changes. - `app/javascript/styles/fonts/roboto-mono.scss`: Code style changes upstream, path changes in glitch-soc. Applied upstream's code style changes. - `app/javascript/styles/fonts/roboto.scss`: Code style changes upstream, path changes in glitch-soc. Applied upstream's code style changes. - `app/models/account.rb`: Textual conflict only caused by glitch-soc using a different value for character limits in a nearby line. Applied upstream's changes. - `app/views/statuses/_simple_status.html.haml`: Attribute added to a tag modified by glitch-soc. Added upstream's attributes. - `yarn.lock`: Upstream added/updated dependencies close to glitch-soc-only ones. Updated/added upstream dependencies.		2022-06-02 09:49:38 +02:00
..
active_record	Remove dependency on pluck_each gem (#16012)	2021-04-12 03:35:58 +02:00
assets
chewy/strategy	Change search indexing to use batches to minimize resource usage (#18451)	2022-05-18 23:29:14 +02:00
devise	Fix authentication before 2FA challenge (#11943)	2019-09-24 04:35:36 +02:00
generators
json_ld	Fixed code quality issues (#15541)	2021-01-31 21:26:09 +01:00
mastodon	Merge branch 'main' into glitch-soc/merge-upstream	2022-05-26 23:30:10 +02:00
paperclip	Remove dependency on running Redis server for db:setup (#18560)	2022-06-01 19:23:31 +02:00
rails	Fix obsolete digitalocean.rake file breaking rake tasks (#15618)	2021-02-11 02:11:30 +01:00
redis	Change Redis#exists calls to Redis#exists? to avoid deprecation warning (#14191)	2020-07-01 19:05:21 +02:00
sanitize_ext	Fix link sanitization for outgoing text/html and text/markdown toots	2022-04-11 09:06:25 +02:00
tasks	Merge branch 'main' into glitch-soc/merge-upstream	2022-05-11 09:37:48 +02:00
templates
terrapin	Add Ruby 3.0 support (#16046)	2021-05-06 14:22:54 +02:00
webpacker	Add subresource integrity for JS and CSS assets (#15096)	2020-11-06 11:56:31 +01:00
cli.rb	Add ability for admins to delete canonical email blocks (#16644)	2021-12-17 23:02:14 +01:00
enumerable.rb	Optimize map { ... }.compact calls (#15513)	2021-01-10 00:32:01 +01:00
exceptions.rb	Fix error resposes for from search prefix (#17963)	2022-04-08 21:21:49 +02:00