747 commits

Author	SHA1	Message	Date
Jeremy Kescher	a38cc7ec83	Merge branch 'upstream-main' into develop	2024-11-17 00:02:19 +01:00
Claire	f0f807cec7	Merge commit '1e71c4e247eb8900a718b04113ffce9c1b8ad2f4' into glitch-soc/merge-upstream	2024-11-10 13:18:43 +01:00
Jeremy Kescher	c9f7e9454c	Merge branch 'upstream-main' into develop	2024-11-08 14:46:42 +01:00
Eugen Rochko	90f4ffa31d	Fix performance of percentile calculation for annual reports (#32765)	2024-11-04 10:11:06 +00:00
Claire	f624ef2778	Merge commit 'b06fd54c305915527e3a6edc575dc23b623143ef' into glitch-soc/merge-upstream ... Conflicts: - `app/helpers/formatting_helper.rb`: Upstream wrapped some code glitch-soc had modified in an OTEL instrumentation span. Wrapped the modified code.	2024-11-03 20:51:58 +01:00
Jeremy Kescher	7fa9c34dee	Merge branch 'upstream-main' into develop	2024-11-01 17:13:04 +01:00
Jonny Saunders	9074c1fac9	Use likes and shares totalItems on status creations and updates (#32620)	2024-10-28 04:55:18 +00:00
Claire	8103e69b17	Merge commit '77cd16f4ee7ab807df6fffb1538a6659a8182a9e' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/styles/mastodon/components.scss`: Conflict caused by glitch-soc changing the path to images, and upstream removing styling using such an image. Removed the styling as upstream did. - `app/models/account.rb`: Conflict due to upstream changing lines adjacent to a change made in glitch-soc to have configurable limits. Ported upstream's changes. - `yarn.lock`: Dependencies adjacent to glitch-soc-only dependencies updated. Updated them as well.	2024-10-26 13:38:07 +02:00
Matt Jankowski	fae1de699c	Remove duplicate indexes from database (#32454)	2024-10-23 13:26:51 +00:00
Jeremy Kescher	d364a1b0a7	Merge branch 'upstream-main' into develop	2024-10-11 00:53:18 +02:00
Jeremy Kescher	9090719153	Merge remote-tracking branch 'refs/remotes/upstream/stable-4.3' into develop	2024-10-10 22:57:13 +02:00
Claire	c574f5b53f	Change how migrations duplicated between glitch and upstream are handled (#2878)	2024-10-09 18:36:19 +02:00
Claire	7e06d724c9	Merge commit '4238da6ee3c93dfd5752e9133cbec958f8ebb18a' into glitch-soc/merge-upstream	2024-10-07 20:45:07 +02:00
Claire	4a859140ec	Merge commit 'edcf3d9234b03d6b1c4b29d1d15339f7f64040fb' into glitch-soc/backports-4.3	2024-10-07 20:03:53 +02:00
Claire	83a98cb81a	Add missing on_delete: :cascade on notification_permissions (#32281)	2024-10-07 16:22:11 +02:00
Claire	a59160cf01	Add missing on_delete: :cascade on notification_permissions (#32281)	2024-10-07 07:46:03 +00:00
Claire	b28ce2424c	Merge commit 'c40ab43dc703be988c277d4ba6b7987a3a80e16c' into glitch-soc/merge-upstream ... Conflicts: - `app/helpers/application_helper.rb`: Upstream added a helper where glitch-soc had its own, not really a conflict. Added upstream's helper. - `lib/sanitize_ext/sanitize_config.rb`: Upstream renamed a constant that was used slightly differently in glitch-soc. Renamed it as upstream did.	2024-10-06 16:07:58 +02:00
Claire	dfe851b476	Merge branch 'stable-4.3' into glitch-soc/backports-4.3 ... Conflicts: - `app/helpers/application_helper.rb`: Upstream added a helper where glitch-soc had its own, not really a conflict. Added upstream's helper.	2024-10-05 20:45:05 +02:00
Matt Jankowski	c91e06bcad	Fix Rails/CreateTableWithTimestamps cop (#30836)	2024-10-04 17:48:03 +02:00
Matt Jankowski	4cae309f6a	Fix Rails/CreateTableWithTimestamps cop (#30836)	2024-10-01 13:56:43 +00:00
Jeremy Kescher	655d28f6a7	Merge remote-tracking branch 'upstream/main' into develop ... Also apply "Make addReaction and removeReaction optional props", therefore: Co-authored by: Essem <smswessem@gmail.com>	2024-09-20 11:53:07 +02:00
Claire	62a39d60ce	Fix rolling updates by moving DropEndToEndMessageTables to post-deployment migrations (#31963)	2024-09-19 09:50:06 +00:00
Matt Jankowski	6f836c45aa	Remove crypto values from doorkeeper application/token scopes (#31945)	2024-09-18 09:27:50 +00:00
Matt Jankowski	5405bdd344	Remove unused E2EE messaging code (#31193)	2024-09-18 09:27:43 +00:00
Claire	10e2b87774	Merge commit '0c3c06f7cc50c9207a44f56e184ce6a41f953171' into glitch-soc/merge-upstream	2024-09-12 12:09:21 +02:00
Jeremy Kescher	0b66cfbc8d	Merge remote-tracking branch 'upstream/main' into develop	2024-09-10 16:15:59 +02:00
Eugen Rochko	e0c27a5047	Add ability to manage which websites can credit you in link previews (#31819)	2024-09-10 12:00:40 +00:00
Claire	fef055db96	Merge commit 'c9ea91f8683cd5c0cfac14071a17e3956ac6d3b0' into glitch-soc/merge-upstream ... Conflicts: - `spec/requests/api/v1/timelines/tag_spec.rb`: Upstream refactored this file, while we had a change to switch a default setting. Updated as upstream did. - `spec/views/statuses/show.html.haml_spec.rb`: Upstream refactored this file, while we stubbed different methods. Updated as upstream did, and updated the stubs accordingly.	2024-09-03 21:51:53 +02:00
Matt Jankowski	4682804448	Fix Rails/ReversibleMigration cop for remove_index (#30832)	2024-09-03 15:32:22 +00:00
Claire	402c1e116d	Merge commit '491033c86cc9c29302bfe68cc94dabad82ded4cc' into glitch-soc/merge-upstream	2024-09-02 17:43:10 +02:00
David Roetzel	388d5473e1	Refactor (ruby) redis configuration (#31694)	2024-09-02 14:19:55 +00:00
Jeremy Kescher	084cfb7d6c	Merge branch 'refs/heads/glitch' into develop	2024-08-11 19:09:56 +02:00
Claire	31a00c0c1a	Merge commit '658addcbf783f6baa922d11c9524ebb9ddbcbc59' into glitch-soc/merge-upstream	2024-08-09 17:15:32 +02:00
Claire	cbdd8edf68	Revamp notification policy options (#31343)	2024-08-09 13:30:55 +00:00
Jeremy Kescher	afa0c78715	Merge branch 'refs/heads/glitch' into develop ... # Conflicts: # app/javascript/flavours/glitch/actions/interactions.js	2024-07-30 08:38:14 +02:00
Claire	fb411b6d0f	Merge commit 'dd5379271410219de0806bb33e7cdfa427ea6988' into glitch-soc/merge-upstream	2024-07-27 13:19:38 +02:00
Emelia Smith	693d9b03ed	Enable OAuth PKCE Extension (#31129)	2024-07-26 08:53:10 +00:00
Jeremy Kescher	1862a60e51	Merge branch 'refs/heads/glitch' into develop	2024-07-16 22:32:15 +02:00
Claire	c546757cd1	Merge commit '66430cb25c824cfad0394216d8e7a523533bcf4b' into glitch-soc/merge-upstream	2024-07-16 17:54:36 +02:00
Emelia Smith	aa88aca0ad	Add optional OAuth application to reports (#30539)	2024-07-16 13:23:08 +00:00
Jeremy Kescher	c1f70540c6	Merge branch 'refs/heads/glitch' into develop	2024-07-02 19:30:16 +02:00
Claire	d2aea85e6c	Merge commit '5d4dbbcc67c98007d417cbe67b5a2261889304dc' into glitch-soc/merge-upstream	2024-06-30 11:25:40 +02:00
Matt Jankowski	51f581e03e	Fix Rails/ReversibleMigration cop for remove (#30833)	2024-06-26 13:51:44 +00:00
Matt Jankowski	528a7f57fa	Fix Rails/ReversibleMigration cop for change_column (#30835)	2024-06-26 13:51:11 +00:00
Claire	3b4607991d	Merge commit '4743657ba24e83c376e9f477fbf49114e6f09a57' into glitch-soc/merge-upstream	2024-06-22 20:59:23 +02:00
Matt Jankowski	4651c0cb39	Fix Rails/ReversibleMigrationMethodDefinition cop (#30794)	2024-06-21 14:43:12 +00:00
Jeremy Kescher	209f90f670	Merge branch 'refs/heads/glitch-soc' into develop	2024-06-16 05:32:45 +02:00
Claire	7277d2f130	Merge commit '496c10542bd39ca86a85d4de81778c134ea4383c' into glitch-soc/merge-upstream	2024-06-07 20:30:51 +02:00
Claire	9e9613b286	Fix mentions.account_id and mentions.status_id not having NOT NULL database constraints (#30591)	2024-06-07 13:45:11 +00:00
Claire	30b00ca2b5	Merge commit '5652ca613582df03e5b838626078981414f3b897' into glitch-soc/merge-upstream	2024-06-06 12:27:26 +02:00