761 commits

Author	SHA1	Message	Date
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
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
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
Claire	e46321e63d	Merge commit 'de4815afda' into glitch-soc/merge-upstream	2024-05-20 12:17:36 +02:00
Renaud Chaput	9658d3e580	Use the job class as span name for Sidekiq root spans (#30353)	2024-05-20 08:01:04 +00:00
Claire	57fb2cf948	Merge commit '12472e7f40' into glitch-soc/merge-upstream	2024-05-17 12:33:41 +02:00
Claire	12472e7f40	Add emphasis on ActiveRecord Encryption configuration values being secret (#30340)	2024-05-17 09:28:40 +00:00
Claire	2810231180	Merge commit 'b2388be71e' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/activitypub/collections_controller.rb`: Upstream renamed a helper method everywhere. There was one glitch-soc line involving changes because of the local-only post feature. Ported upstream's change.	2024-05-16 19:30:10 +02:00
Matt Jankowski	1b6eb2c7f0	Enable YJIT when available (#30310)	2024-05-16 09:56:48 +00:00
Renaud Chaput	283a891e92	Allow to customise the OTEL service name prefix (#30322)	2024-05-16 09:28:10 +00:00
Matt Jankowski	6beead3867	Move simplecov config into rails_helper (#30302)	2024-05-15 09:33:36 +00:00
Claire	666760f450	Merge commit '1bf661cddb' into glitch-soc/merge-upstream ... Conflicts: - `package.json`: Upstream fixed a command we have modified in glitch-soc. Updated as upstream did.	2024-05-14 20:47:14 +02:00
Nick Schonning	13fb54920b	Enable Style/IfUnlessModifier RuboCop (#30260)	2024-05-13 09:54:15 +00:00
Claire	f35ba6963d	Merge commit '1959365c2f' into glitch-soc/merge-upstream	2024-05-11 22:10:56 +02:00
Renaud Chaput	68b9fe824d	Add OpenTelemetry instrumentation (#30130) ... Co-authored-by: Juliano Costa <juliano.costa@datadoghq.com> Co-authored-by: Robb Kidd <robbkidd@honeycomb.io>	2024-05-10 12:40:20 +00:00
Matt Jankowski	040aaf3a48	Use default: ... assignment for Devise config, fixes Style/ClassVars cop (#30214)	2024-05-10 09:42:01 +00:00
Claire	3789d9f825	Merge commit 'b7902225d6' into glitch-soc/merge-upstream ... Conflicts: - `spec/validators/status_length_validator_spec.rb`: Upstream refactored tests to stub `StatusLengthValidator::MAX_CHARS` while glitch-soc had custom code to read from `MAX_TOOT_CHARS`. Switched to using upstream's implementation of the tests.	2024-05-04 16:28:30 +02:00
Claire	bceb45adda	Merge commit '3f6887557b' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/entrypoints/common.js`: Upstream moved everything from `app/javascript/packs` to `app/javascript/entrypoints` while this file was a glitch-soc addition. Moved it like the rest. - `tsconfig.json`: Conflict due to glitch-soc's flavor. Updated like upstream. Also moved and updated the following files accordingly: - `app/javascript/flavours/vanilla/theme.yml` - `app/javascript/flavours/glitch/theme.yml` - everything in `app/javascript/flavours/glitch/packs`	2024-05-04 14:59:00 +02:00
Claire	33368e3e79	Change ActiveRecordEncryption variable to be more explicit (#30151)	2024-05-03 09:26:24 +00:00
Claire	b039e62194	Merge commit 'a2399046ca' into glitch-soc/merge-upstream	2024-05-01 19:49:59 +02:00
Claire	eeefb7cdbc	Merge commit 'a15139bc02' into glitch-soc/merge-upstream	2024-05-01 19:42:34 +02:00
Claire	6204d13a2e	Merge commit 'ec71c02c4b' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile`: There was an extra newline in glitch-soc for some reason. Removed it.	2024-05-01 19:38:34 +02:00
Claire	946bd2e7e1	Merge commit '0622107449' into glitch-soc/merge-upstream	2024-05-01 19:16:48 +02:00
Claire	15f6d2d038	Merge commit 'd27eb181f6' into glitch-soc/merge-upstream ... Conflicts: - `spec/requests/api/v2/instance_spec.rb`: Conflict due to glitch-soc having a different default site name. Updated the tests as upstream did, keeping glitch-soc's default name.	2024-05-01 17:22:02 +02:00
Matt Jankowski	32ead51e5a	Add material design icons to admin/settings views (#27780) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2024-04-23 16:43:49 +00:00
Emelia Smith	049b159beb	Add read:me OAuth 2.0 scope, allowing more limited access to user data (#29087)	2024-04-23 11:47:00 +00:00
Tim Rogers	1ca6ff8ca5	Fixed crash when supplying FFMPEG_BINARY environment variable (#30022)	2024-04-22 09:00:24 +00:00
Matt Jankowski	c7384adc00	Fix Style/TrailingCommaInArguments cop (#30003)	2024-04-19 20:37:18 +00:00
Matt Jankowski	933189887b	Fix Style/StringLiterals cop (#30005)	2024-04-19 20:33:00 +00:00
Matt Jankowski	8d47ba893a	Fix Style/PercentLiteralDelimiters cop (#30006)	2024-04-19 20:32:26 +00:00
Matt Jankowski	828299e71c	Enable AR Encryption (#29831)	2024-04-17 09:19:02 +00:00
Matt Jankowski	0d9ad96d3f	Rename PremailerWebpackStrategy -> PremailerBundledAssetStrategy (#29934)	2024-04-15 09:16:59 +00:00