813 commits

Author	SHA1	Message	Date
Essem	686007b390	Merge remote-tracking branch 'upstream/main'	2024-07-25 16:14:48 -05:00
Claire	cf5d2c3fe4	Merge commit '887e64efd4' into glitch-soc/merge-upstream	2024-07-25 17:47:02 +02:00
Adam Niedzielski	887e64efd4	Allow @ at the end of an URL (#31124)	2024-07-25 15:02:58 +00:00
Essem	53cd9df580	Merge remote-tracking branch 'upstream/main'	2024-07-11 22:06:07 -05:00
Claire	52fb4f16ef	Merge commit '2ea9336b68' into glitch-soc/merge-upstream	2024-07-10 16:58:06 +02:00
Essem	4aa2f92bef	Merge remote-tracking branch 'upstream/main'	2024-07-10 09:41:37 -05:00
Renaud Chaput	36592d10aa	Change Sidekiq readiness file to use an environment variable (#30988)	2024-07-10 12:57:25 +00:00
Claire	388672ff0d	Merge commit '967505ee9b' into glitch-soc/merge-upstream	2024-07-09 20:39:09 +02:00
Renaud Chaput	7542a134d5	Add a file for Sidekiq to signal it is ready to process jobs (#30971)	2024-07-09 10:47:08 +00:00
Claire	11dd51ef44	Merge commit '63ba69810e' 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
Claire	8de5df225e	Change instructions to use bundle exec rails instead of rake (#30917)	2024-07-05 08:54:45 +00:00
Essem	8a01720cb2	Merge remote-tracking branch 'upstream/main'	2024-06-30 15:41:10 -05:00
Claire	d2aea85e6c	Merge commit '5d4dbbcc67' into glitch-soc/merge-upstream	2024-06-30 11:25:40 +02:00
Essem	60b67b0976	Merge remote-tracking branch 'upstream/main'	2024-06-28 20:20:32 -05:00
Matt Jankowski	bc3737f0c3	Add detail about running version on vips error failure (#30858)	2024-06-27 16:27:42 +00:00
Claire	b15a3614dc	Stub Vips::Error when not using libvips (#30857)	2024-06-27 15:25:27 +00:00
Claire	6f2771cb32	Merge commit '845fe1c693' into glitch-soc/merge-upstream	2024-06-25 17:57:39 +02:00
Renaud Chaput	845fe1c693	Add the Interlingua locale (#30828)	2024-06-25 14:05:24 +00:00
Claire	21ca03581a	Merge commit '6527d50391' into glitch-soc/merge-upstream	2024-06-24 19:39:42 +02:00
Tim Rogers	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
Essem	167a30b2bf	Merge remote-tracking branch 'upstream/main'	2024-06-19 21:43:32 -05:00
Claire	395b9011ee	Merge commit 'd5f02adad7' 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
Matt Jankowski	980034e2e1	Fix Style/NilLambda cop in paperclip initializer (#30695)	2024-06-14 09:50:50 +00:00
Essem	82e12570a7	Merge remote-tracking branch 'upstream/main'	2024-06-12 19:48:26 -05:00
Claire	4daed855e5	Merge commit 'd818ddd687' into glitch-soc/merge-upstream	2024-06-11 19:46:11 +02:00
Essem	9dcd9ba5b2	Merge remote-tracking branch 'upstream/main'	2024-06-10 16:59:22 -05:00
Matt Jankowski	0e1110c947	Use SECRET_KEY_BASE_DUMMY feature as placeholder during asset compilation (#30505)	2024-06-10 20:08:04 +00:00
Claire	be68f8f4af	Merge commit '9cc4040308' into glitch-soc/merge-upstream	2024-06-10 18:20:08 +02:00
Matt Jankowski	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
Claire	7277d2f130	Merge commit '496c10542b' into glitch-soc/merge-upstream	2024-06-07 20:30:51 +02:00
Claire	80cd001e0a	Fix linting issue (#30595)	2024-06-07 14:32:29 +00:00
Isa S	773283ffb9	Make S3's retry limit a ENV variable (#23215)	2024-06-07 13:54:55 +00:00
Victor Dyotte	299ae9bf92	Add S3_KEY_PREFIX environment variable (#30181)	2024-06-07 12:29:30 +00:00
Claire	30b00ca2b5	Merge commit '5652ca6135' into glitch-soc/merge-upstream	2024-06-06 12:27:26 +02:00
Emelia Smith	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
Eugen Rochko	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
Matt Jankowski	4d3748ac44	Fix rack attack match_type value typo in logging config (#30514)	2024-06-03 07:16:01 +00:00
Matt Jankowski	a22865a352	Add :email to filter parameter logging config (#30492)	2024-05-31 09:35:56 +00:00
Essem	fad5adbfe6	Merge remote-tracking branch 'upstream/main'	2024-05-30 09:32:49 -05:00
Claire	b8271f20c5	Merge commit '7f808ff6e9' into glitch-soc/merge-upstream	2024-05-30 15:41:31 +02:00
Claire	73a78cc19d	Fix rate-limiting incorrectly triggering a session cookie on most endpoints (#30483)	2024-05-30 12:56:18 +00:00
Claire	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
Claire	16249946ae	Merge pull request from GHSA-q3rg-xx5v-4mxh	2024-05-30 14:14:04 +02:00
Claire	c827a98f19	Merge commit 'd20a5c3ec9' 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
Emelia Smith	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
Essem	f0df278c57	Merge remote-tracking branch 'upstream/main'	2024-05-27 14:48:20 -05:00
Nick Schonning	87156f57b5	Enable Style/StringConcatenation (#30428)	2024-05-27 09:41:45 +00:00
Claire	1a2a28eb4a	Fix rubocop warnings	2024-05-24 17:13:34 +02:00
Claire	d76106da12	Merge commit 'ccb6aeddac' into glitch-soc/merge-upstream	2024-05-24 17:08:21 +02:00
Renaud Chaput	acc77c3836	Add instrumentation to the search services (#30350)	2024-05-24 13:13:23 +00:00