Claire f5b7307890 Merge commit 'f99e05710ea06cf10bbd3fb64ae8c00b095cb455' into glitch-soc/merge-upstream ...

Conflicts:
- `.rubocop_todo.yml`:
  Took upstream's version of the conflicting lines.

2023-12-21 19:24:10 +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

Add ES_PRESET option to customize numbers of shards and replicas (#26483)

2023-08-14 17:46:16 +02: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 commit 'f99e05710ea06cf10bbd3fb64ae8c00b095cb455' into glitch-soc/merge-upstream

2023-12-21 19:24:10 +01:00

paperclip

Fix division by zero in video in bitrate computation code (#27129)

2023-09-25 17:07:52 +02: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 '12c22ee5e71ae0220ea10199e4d10deb4140ec44' into glitch-soc/merge-upstream

2023-12-19 20:40:05 +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

Fix error when passing unknown filter param in REST API (#20626)

2022-11-14 08:06:06 +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