Claire f09f5b35f2 Merge commit 'd97d31cce664281d868e4c661451687a301c97c8' into glitch-soc/merge-upstream ... Conflicts: - `app/models/account.rb`: Upstream refactored this file a bit, moving validation limits to constants. We already had a similar change, although with different constant names. Updated to match upstream's code. The following files were also modified accordingly: - `app/views/settings/profiles/show.html.haml` - `spec/requests/api/v1/accounts/credentials_spec.rb`		2024-05-04 16:12:51 +02:00
..
active_record	Rails 7.1 update (#25963)	2023-10-23 17:58:29 +00:00
assets	Upgrade to Stylelint 15 with Prettier (#23558)	2023-02-13 04:57:03 +01:00
chewy	Add ES_PRESET option to customize numbers of shards and replicas (#26483)	2023-08-14 17:46:16 +02:00
devise/strategies	Disable Style/SignalException cop (#30064)	2024-04-29 12:32:06 +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 'd97d31cce664281d868e4c661451687a301c97c8' into glitch-soc/merge-upstream	2024-05-04 16:12:51 +02:00
paperclip	Fixed crash when supplying FFMPEG_BINARY environment variable (#30022)	2024-04-22 09:00:24 +00: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 'f476d9dab2f5cca6ae44b95961df6b6557d66dab' into glitch-soc/merge-upstream	2023-12-17 23:04:16 +01:00
simple_navigation	Add customizable user roles (#18641)	2022-07-05 02:41:40 +02:00
tasks	Merge commit 'a15139bc02d279b9ef85e95990f41e3e88838d20' into glitch-soc/merge-upstream	2024-05-01 19:42:34 +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 error when passing unknown filter param in REST API (#20626)	2022-11-14 08:06:06 +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