Claire 0d69cc068c Merge commit '26f25ef4bafd5ad84d03d8cb7ad0d868360175e5' into glitch-soc/stable-4.3 ... Conflicts: - `app/javascript/styles/mastodon/components.scss`: Conflict caused by glitch-soc changing the path to images, and upstream removing styling using such an image. Removed the styling as upstream did. - `app/models/trends/statuses.rb`: Upstream added a date restriction to trendable posts, while glitch-soc had slightly different conditions. Added the date restriction to glitch-soc's conditions.		2024-12-02 21:49:12 +01:00
..
action_dispatch	Merge pull request from GHSA-c2r5-cfqr-c553	2024-05-30 14:24:29 +02:00
active_record	Add experimental server-side notification grouping (#29889)	2024-06-03 08:35:59 +00:00
arel	Add experimental server-side notification grouping (#29889)	2024-06-03 08:35:59 +00:00
assets	Upgrade to Stylelint 15 with Prettier (#23558)	2023-02-13 04:57:03 +01:00
chewy	Refactor (ruby) redis configuration (#31694)	2024-09-02 14:19:55 +00:00
devise/strategies	Disable `Style/SignalException` cop (#30064)	2024-04-29 12:32:06 +00:00
elasticsearch	Fix OpenSearch compatibility issue (#30278)	2024-05-14 17:54:28 +00:00
generators/post_deployment_migration	Clean up the post deployment migration generator (#24233)	2023-04-11 11:25:29 +02:00
linter	Consistently use middle dot (·) instead of bullet (•) to separate items (#25248)	2023-06-02 19:58:18 +02:00
mastodon	Merge commit '26f25ef4bafd5ad84d03d8cb7ad0d868360175e5' into glitch-soc/stable-4.3	2024-12-02 21:49:12 +01:00
paperclip	Fix uploading higher-than-wide GIF profile picture with libvips enabled (#32911)	2024-12-02 16:20:32 +01:00
rails	Enable Rubocop Style/FrozenStringLiteralComment (#23793)	2023-07-12 09:47:08 +02:00
redis	Update rubocop and rubocop-rspec (#26329)	2023-08-22 09:31:40 +02:00
sanitize_ext	Merge commit '2caa3f365ded73be17b623177967110e66f14061' into glitch-soc/merge-upstream	2024-09-09 18:22:41 +02:00
simple_navigation	Add customizable user roles (#18641)	2022-07-05 02:41:40 +02:00
stoplight	Fix compatibility with Redis < 6.2 again (#30412)	2024-06-19 16:59:37 +00:00
tasks	Merge commit '49b3d5692e6f217e6506674ad8a623a4ba8d0c5f' into glitch-soc/backports-4.3	2024-10-15 17:42:22 +02:00
templates/haml/scaffold	Use `tt` extension for form scaffold template (#29676)	2024-04-10 09:20:21 +00:00
terrapin	Autofix Rubocop Style/HashSyntax (#23754)	2023-05-04 05:54:26 +02:00
webpacker	Fix `Style/SingleArgumentDig` cop in webpacker/manifest_extensions (#29929)	2024-04-15 09:15:32 +00:00
exceptions.rb	Fix `min_id` and `max_id` causing error in search API (#32857)	2024-12-02 16:20:32 +01:00
premailer_bundled_asset_strategy.rb	Rename `PremailerWebpackStrategy` -> `PremailerBundledAssetStrategy` (#29934)	2024-04-15 09:16:59 +00:00
public_file_server_middleware.rb	Add hardened headers to user-uploaded files (#25756)	2023-07-06 14:31:37 +02:00