Jeremy Kescher 009251a17d Merge branch 'glitch-soc' into develop ... # Conflicts: # app/javascript/mastodon/features/ui/components/navigation_panel.jsx # app/javascript/mastodon/initial_state.js # app/serializers/initial_state_serializer.rb # config/initializers/chewy.rb # config/locales/en.yml # config/locales/ja.yml		2024-02-24 19:11:05 +01: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	Merge remote-tracking branch 'essem/feature/emoji-reactions' into merge/emoji-reactions	2024-01-02 12:16:35 +01:00
devise/strategies	Move lib/devise/* to lib/devise/strategies/* (#27638)	2023-11-29 10:10:21 +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 branch 'glitch-soc' into develop	2024-02-24 19:11:05 +01:00
paperclip	Fix error when processing remote files with unusually long names (#28823)	2024-01-19 18:52:59 +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 'cfa71a4d16e71b04a42dda564ed8e188bd1badd9' into glitch-soc/merge-upstream	2024-02-24 15:43:15 +01:00
templates/haml/scaffold	Clean up the post deployment migration generator (#24233)	2023-04-11 11:25:29 +02:00
terrapin	Autofix Rubocop Style/HashSyntax (#23754)	2023-05-04 05:54:26 +02:00
webpacker	Fix the crossorigin attribute (#26096)	2023-07-21 11:14:26 +02:00
exceptions.rb	Add reject blurhash to Admin setting	2024-02-24 11:14:32 +01:00
http_extensions.rb	Fix already initialized constant warning (#26542)	2023-08-18 16:06:46 +02:00
premailer_webpack_strategy.rb	Move lib/mastodon/premailer_webpack_strategy to lib/ (#27636)	2023-11-29 10:08:55 +00:00
public_file_server_middleware.rb	Add hardened headers to user-uploaded files (#25756)	2023-07-06 14:31:37 +02:00