Claire ddf3ad9541 Merge commit '3bf896c973404261f4f7b25c25ea22adb1a85e7d' into glitch-soc/main ...

Conflicts:
- `package.json`:
  Upstream removed a dependency textually close to a glitch-only dependency.
  Updated as upstream while keeping our dependency.

2023-12-17 17:43:30 +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

Fix authentication before 2FA challenge (#11943)

2019-09-24 04:35:36 +02: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 '2e6bf60f1549e5c1f1cfea2d614f978bea17b8a2' into glitch-soc/merge-upstream

2023-12-10 18:05:02 +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 branch 'main' into glitch-soc/merge-upstream

2023-07-06 15:16:34 +02:00

simple_navigation

Add customizable user roles (#18641)

2022-07-05 02:41:40 +02:00

tasks

Merge commit 'd9503a1965a16328b62ea7bf0bb54e87cbe30d29' into glitch-soc/merge-upstream

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

public_file_server_middleware.rb

Add hardened headers to user-uploaded files (#25756)

2023-07-06 14:31:37 +02:00