169b35869f
Merge commit 'a1ddaa9ee96ab1d05f4e37f3472b0418e0d5628e' into glitch-soc/merge-upstream
2024-08-14 21:17:43 +02:00
02df1b4e4a
Finish email allow/deny list naming migration ( #30530 )
2024-08-13 07:37:32 +00:00
83480df820
Merge commit 'b42661ba95b7872ba278fca9b0fee8faffd89e52' into glitch-soc/merge-upstream
...
Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
Upstream added `<s>` to the list of allowed tags, the conflict is because
we have a different list of allowed tags.
Added `<s>` like upstream did.
2024-08-12 17:46:24 +02:00
a1f723a6a4
Add support for PKCE Extension in OmniAuth OIDC ( #31131 )
2024-08-12 14:32:52 +00:00
31a00c0c1a
Merge commit '658addcbf783f6baa922d11c9524ebb9ddbcbc59' into glitch-soc/merge-upstream
2024-08-09 17:15:32 +02:00
eaedd52def
Fix incorrect rate limit on PUT requests ( #31356 )
2024-08-09 14:48:05 +00:00
cf5d2c3fe4
Merge commit '887e64efd4abbf3980e008c7a5441b44fbd6c766' into glitch-soc/merge-upstream
2024-07-25 17:47:02 +02:00
887e64efd4
Allow @ at the end of an URL ( #31124 )
2024-07-25 15:02:58 +00:00
52fb4f16ef
Merge commit '2ea9336b6855b44126a55106a81e96ea68eaf8ff' into glitch-soc/merge-upstream
2024-07-10 16:58:06 +02:00
36592d10aa
Change Sidekiq readiness file to use an environment variable ( #30988 )
2024-07-10 12:57:25 +00:00
388672ff0d
Merge commit '967505ee9bcacf0e5189aa06c654ff586c198a46' into glitch-soc/merge-upstream
2024-07-09 20:39:09 +02:00
7542a134d5
Add a file for Sidekiq to signal it is ready to process jobs ( #30971 )
2024-07-09 10:47:08 +00:00
11dd51ef44
Merge commit '63ba69810eca80fc2d10114a79f2988c1b75892f' into glitch-soc/merge-upstream
...
Conflicts:
- `.env.production.sample`:
Upstream and glitch-soc had different comments, some comments got updated upstream.
Updated them in glitch-soc accordingly.
2024-07-06 21:02:42 +02:00
8de5df225e
Change instructions to use `bundle exec rails` instead of `rake` ( #30917 )
2024-07-05 08:54:45 +00:00
d2aea85e6c
Merge commit '5d4dbbcc67c98007d417cbe67b5a2261889304dc' into glitch-soc/merge-upstream
2024-06-30 11:25:40 +02:00
bc3737f0c3
Add detail about running version on vips error failure ( #30858 )
2024-06-27 16:27:42 +00:00
b15a3614dc
Stub `Vips::Error` when not using libvips ( #30857 )
2024-06-27 15:25:27 +00:00
6f2771cb32
Merge commit '845fe1c6936a7b386fd74ae567c19600a88e795a' into glitch-soc/merge-upstream
2024-06-25 17:57:39 +02:00
845fe1c693
Add the Interlingua locale ( #30828 )
2024-06-25 14:05:24 +00:00
21ca03581a
Merge commit '6527d5039141fe4a80645147b581d76952a64f39' into glitch-soc/merge-upstream
2024-06-24 19:39:42 +02:00
f6e466058a
Added check for STATSD_ADDR setting to emit a warning and proceed rather than crashing if the address is unreachable ( #30691 )
2024-06-24 14:41:04 +00:00
395b9011ee
Merge commit 'd5f02adad716520b6b9014553bc730dcef5b2f50' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/application_helper.rb`:
Not a real conflict, just upstream adding a method textually adjacent to
glitch-soc only code.
Ported upstream's change.
2024-06-17 18:30:28 +02:00
980034e2e1
Fix `Style/NilLambda` cop in paperclip initializer ( #30695 )
2024-06-14 09:50:50 +00:00
4daed855e5
Merge commit 'd818ddd6870094e89e58ef61f37da4cb73935856' into glitch-soc/merge-upstream
2024-06-11 19:46:11 +02:00
0e1110c947
Use `SECRET_KEY_BASE_DUMMY` feature as placeholder during asset compilation ( #30505 )
2024-06-10 20:08:04 +00:00
be68f8f4af
Merge commit '9cc4040308a758d4b77961f4da79cf63a044fffe' into glitch-soc/merge-upstream
2024-06-10 18:20:08 +02:00
0cf91213c9
Opt in to remaining Rails 7.1 defaults ( #30332 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-06-10 06:32:20 +00:00
7277d2f130
Merge commit '496c10542bd39ca86a85d4de81778c134ea4383c' into glitch-soc/merge-upstream
2024-06-07 20:30:51 +02:00
80cd001e0a
Fix linting issue ( #30595 )
2024-06-07 14:32:29 +00:00
773283ffb9
Make S3's retry limit a ENV variable ( #23215 )
2024-06-07 13:54:55 +00:00
299ae9bf92
Add `S3_KEY_PREFIX` environment variable ( #30181 )
2024-06-07 12:29:30 +00:00
30b00ca2b5
Merge commit '5652ca613582df03e5b838626078981414f3b897' into glitch-soc/merge-upstream
2024-06-06 12:27:26 +02:00
e02d23b549
Change `read:me` scope to `profile` scope ( #30357 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-06-06 07:30:10 +00:00
5f15a892fa
Add support for libvips in addition to ImageMagick ( #30090 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-06-05 19:15:39 +00:00
4d3748ac44
Fix rack attack `match_type` value typo in logging config ( #30514 )
2024-06-03 07:16:01 +00:00
a22865a352
Add `:email` to filter parameter logging config ( #30492 )
2024-05-31 09:35:56 +00:00
b8271f20c5
Merge commit '7f808ff6e9148f1cfe1e16d000e2405b6e31f243' into glitch-soc/merge-upstream
2024-05-30 15:41:31 +02:00
73a78cc19d
Fix rate-limiting incorrectly triggering a session cookie on most endpoints ( #30483 )
2024-05-30 12:56:18 +00:00
3fa0dd0b88
Merge pull request from GHSA-c2r5-cfqr-c553
...
* Add hardening monkey-patch to prevent IP spoofing on misconfigured installations
* Remove rack-attack safelist
2024-05-30 14:24:29 +02:00
16249946ae
Merge pull request from GHSA-q3rg-xx5v-4mxh
2024-05-30 14:14:04 +02:00
c827a98f19
Merge commit 'd20a5c3ec9ed40a991245fe32d0acb6187dd48c4' into glitch-soc/merge-upstream
...
Conflicts:
- `yarn.lock`:
Not a real conflict, just a line adjacent to a glitch-soc only dependency
getting updated.
Updated dependencies as upstream did.
2024-05-29 17:03:24 +02:00
d20a5c3ec9
Fix: remove broken OAuth Application vacuuming & throttle OAuth Application registrations ( #30316 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-05-29 14:00:05 +00:00
87156f57b5
Enable Style/StringConcatenation ( #30428 )
2024-05-27 09:41:45 +00:00
1a2a28eb4a
Fix rubocop warnings
2024-05-24 17:13:34 +02:00
d76106da12
Merge commit 'ccb6aeddacbab950d7d7f1b0d2b64212d7aa99eb' into glitch-soc/merge-upstream
2024-05-24 17:08:21 +02:00
acc77c3836
Add instrumentation to the search services ( #30350 )
2024-05-24 13:13:23 +00:00
e46321e63d
Merge commit 'de4815afda0809bf999519aabda1cd14c67278da' into glitch-soc/merge-upstream
2024-05-20 12:17:36 +02:00
9658d3e580
Use the job class as span name for Sidekiq root spans ( #30353 )
2024-05-20 08:01:04 +00:00
57fb2cf948
Merge commit '12472e7f407c42bcff6ee204b9f1887b5824734f' into glitch-soc/merge-upstream
2024-05-17 12:33:41 +02:00
12472e7f40
Add emphasis on ActiveRecord Encryption configuration values being secret ( #30340 )
2024-05-17 09:28:40 +00:00
Claire
Matt Jankowski
Emelia Smith
Adam Niedzielski
Renaud Chaput
Tim Rogers
Isa S
Victor Dyotte
Eugen Rochko
Nick Schonning