1,335 commits

Author	SHA1	Message	Date
Essem	845f95bc5d	Merge remote-tracking branch 'upstream/main'	2024-08-03 18:36:56 -05:00
Claire	8dd671a977	Merge commit 'a50c8e951f' into glitch-soc/merge-upstream	2024-07-31 18:16:01 +02:00
Claire	4eab6aef95	Change User-Agent to use Mastodon as the product, and http.rb as platform details (#31192)	2024-07-30 21:40:42 +00:00
Essem	2f50bcafc8	Merge remote-tracking branch 'upstream/main'	2024-07-24 23:04:49 -05:00
Claire	68000956f4	Merge commit 'cd0ca4b994' into glitch-soc/merge-upstream	2024-07-23 19:31:23 +02:00
Matt Jankowski	1b839d2cba	Fix mastodon:stats decoration of stats rake task (#31104)	2024-07-23 06:51:57 +00:00
Essem	6450fb0cf5	Merge remote-tracking branch 'upstream/main'	2024-07-04 10:31:27 -05:00
Claire	e61a7794f8	Merge commit 'df9e26158d' into glitch-soc/merge-upstream ... Conflicts: - `lib/sanitize_ext/sanitize_config.rb`: Conflict because glitch-soc has a different list of allowed tags. Added upstream's new allowed tags while keeping ours. - `spec/requests/api/v1/timelines/public_spec.rb`: Conflict because of glitch-soc's default settings. Updated accordingly.	2024-07-04 17:12:14 +02:00
Claire	df9e26158d	Bump version to v4.3.0-alpha.5 (#30920)	2024-07-04 14:59:54 +00:00
Emelia Smith	47f0faebc9	Implement HTML ruby tags for east-asian languages (#30897)	2024-07-03 20:05:59 +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
Claire	ba6a558a70	Simplify color extraction code using bandunfold (#30869)	2024-06-28 22:41:27 +00:00
Claire	7a84b76bb1	Drop favicon.ico generation (#30375)	2024-06-26 13:44:08 +00:00
Essem	e18357ff63	Merge remote-tracking branch 'upstream/main'	2024-06-20 17:23:08 -05:00
Essem	167a30b2bf	Merge remote-tracking branch 'upstream/main'	2024-06-19 21:43:32 -05:00
Claire	cabd7c21fc	Merge commit '2cda1dd542' into glitch-soc/merge-upstream	2024-06-19 19:37:37 +02:00
Claire	2cda1dd542	Fix compatibility with Redis < 6.2 again (#30412)	2024-06-19 16:59:37 +00: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
Michael Stanclift	d5f02adad7	Add option to use native Ruby driver for Redis (#30717)	2024-06-17 12:28:01 +00:00
Claire	4daed855e5	Merge commit 'd818ddd687' into glitch-soc/merge-upstream	2024-06-11 19:46:11 +02:00
Claire	328d3a87f5	Fix libvips color extraction when multiple maxima differ only on blue component (#30632)	2024-06-11 13:58:10 +00:00
Essem	9dcd9ba5b2	Merge remote-tracking branch 'upstream/main'	2024-06-10 16:59:22 -05:00
Claire	7277d2f130	Merge commit '496c10542b' into glitch-soc/merge-upstream	2024-06-07 20:30:51 +02:00
Claire	82be5d033f	Improve handling of libvips failures (#30597)	2024-06-07 15:39:41 +00:00
Matt Jankowski	37e4d96b70	Restore verbose option to media remove cli (#30536)	2024-06-07 12:39:53 +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
Claire	974335e414	Add experimental server-side notification grouping (#29889)	2024-06-03 08:35:59 +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	7f808ff6e9	Bump version to v4.3.0-alpha.4 (#30482)	2024-05-30 13:34:46 +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	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
Claire	5d7d23999c	Fix leaking Elasticsearch connections in Sidekiq processes (#30450)	2024-05-29 08:15:06 +00:00
Essem	9b0c46ebf2	Merge remote-tracking branch 'upstream/main'	2024-05-20 21:35:02 -05:00
Claire	e46321e63d	Merge commit 'de4815afda' into glitch-soc/merge-upstream	2024-05-20 12:17:36 +02:00
Matt Jankowski	def6b686ff	Fix Rails/WhereRange cop (#30343)	2024-05-20 09:37:36 +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
Claire	c2ca3d152f	Fix off-by-one in tootctl media commands (#30306)	2024-05-15 13:11:13 +00:00
Essem	4f37b4873f	Merge remote-tracking branch 'upstream/main'	2024-05-14 21:20:27 -05: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
Claire	b5b84fad65	Fix OpenSearch compatibility issue (#30278)	2024-05-14 17:54:28 +00:00
Claire	f35ba6963d	Merge commit '1959365c2f' into glitch-soc/merge-upstream	2024-05-11 22:10:56 +02:00
Matt Jankowski	0d397db5dd	Consolidate system specs into single directory, use rspec tags for configuration (#30206)	2024-05-10 12:36:09 +00:00
Essem	f26fba7473	Merge remote-tracking branch 'upstream/main'	2024-05-08 13:58:54 -05:00
Claire	f7dadc9f0b	Merge commit '5cd13ee4f1' into glitch-soc/merge-upstream	2024-05-07 12:13:02 +02:00