tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
27,842 Commits 5 Branches 0 Tags
Commit Graph

698 Commits

Author SHA1 Message Date
Claire
4fbd1ad7ae Merge commit 'd13d7b4566d551d027830f7dfc987ba3a8e2dd4f' into glitch-soc/merge-upstream 
Conflicts are too numerous to list, but they are all caused by upstream's
theming changes and all have to do with the differences between upstream and
glitch-soc in the theming systems.

They were all manually resolved by adapting the relevant code.
 2026-02-11 13:32:18 +01:00
Claire
63aac77b61
Purge custom emojis on domain suspension (#37808) 2026-02-10 16:13:06 +00:00
Claire
8f58c42ca3 Merge commit '2e30044a374811bc94fd62a8159cb2c9ffe18a4d' into glitch-soc/merge-upstream 2026-02-06 22:45:55 +01:00
Echo
1310628a60
Bust relationship cache key (#37760) 2026-02-06 14:36:12 +00:00
Claire
59e02a628d Merge commit 'f652c54c3334890176331f62150559a96eeb41ae' into glitch-soc/merge-upstream 
Conflicts:
- `app/services/backup_service.rb`:
  Upstream refactored activity serialization while glitch-soc passed an extra argument.
  Followed upstream's refactor, keeping our extra argument.
 2026-02-05 12:43:12 +01:00
David Roetzel
73206856c5
Refactor activity serialization (#37678) 2026-02-05 09:39:27 +00:00
Claire
0e154b859f Merge commit '6a5578a0db1aed100b6a3ac82b477923d221c350' into glitch-soc/merge-upstream 2026-01-30 12:00:44 +01:00
Claire
0997ae0627
Clear affected relationship cache on Move activities (#37664) 2026-01-30 09:15:22 +00:00
Claire
d62a7775b5 Merge commit 'd0502ac3c1630e281fda5492cbc28390262b0aeb' into glitch-soc/merge-upstream 2026-01-29 21:08:46 +01:00
Matt Jankowski
23148dc536
Update rubocop to version 1.8.40 (#37628) 2026-01-29 10:14:14 +00:00
Claire
bc3871f992
Fix followers with profile subscription (bell icon) being notified of post edits (#37646) 2026-01-29 09:38:57 +00:00
Claire
5a45a3203a Merge commit '7af5ba271d6f04831f000e9b815914375e42abeb' into glitch-soc/merge-upstream 2026-01-27 18:03:27 +01:00
Claire
a20519d671
Clean up arg handling for notification worker (#37587) 2026-01-27 15:59:51 +00:00
Claire
73fc40993b
Fix filtering of mentions from filtered-on-their-origin-server accounts (#37583) 2026-01-27 09:53:21 +00:00
Claire
b96c8ecff4 Merge commit '89c1b9a8fdfe38881ad1b6c22f20240b087aa993' into glitch-soc/merge-upstream 2026-01-26 18:09:54 +01:00
Claire
8b95254883 Merge commit 'c36db57acedf0033c090748125c665a0360cd11f' into glitch-soc/merge-upstream 2026-01-23 17:57:20 +01:00
Matt Jankowski
29ec2cd186
Add targeted_account_notes association to simplify usage (#35540) 2026-01-23 16:35:19 +00:00
Shlee
1809048105
Safefy: Updated Admin::AccountDeletionWorker to match AccountDeletionWorker (#37577) 2026-01-22 16:01:44 +00:00
Claire
b4ed1e6c99 Merge commit '19bc3e76ea1d7fa2d9af711613a77fc0f5f0d1b5' into glitch-soc/main 
Conflicts:
- `app/helpers/theme_helper.rb`:
  Upstream added a helper to insert javascript tags, close to where we had
  modified code.
  Ported upstream's change.
 2026-01-13 18:30:48 +01:00
Matt Jankowski
92ad380e11
Update rubocop to version 1.82.1 (#37475) 2026-01-13 16:21:25 +00:00
Shlee
232b9e9cc6
Fix delivery worker counting unsalvageable HTTP errors as successes (#37235) 2026-01-13 13:49:36 +00:00
Claire
97ff0f94bf Merge commit 'a8109e50fc313b8124a3e471d41b490df59a68b8' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream changed a field that was moved to another page due to glitch-soc's theming system.
  Ignored this one change.
 2025-12-18 18:10:30 +01:00
Claire
2a7e5fb3f7
Skip followers synchronization for accounts with 25k followers or more (#37302) 2025-12-18 14:42:47 +00:00
Claire
34aa825e96 Merge commit 'b3b5bf26d14f809a562244642949826b6a91bade' into glitch-soc/merge-upstream 2025-12-04 20:16:21 +01:00
Claire
73294e2561
Fix typo in AsyncRefresh ID for GenerateAnnualReportWorker (#37096) 2025-12-03 08:31:14 +00:00
Claire
f8422e1fa4
Add API for on-demand generation of annual reports (#37055) 2025-12-02 13:37:05 +00:00
Claire
a7ba4ba446 Merge commit '26e7fe97714d077930621f9111b7eaad2774df65' into glitch-soc/merge-upstream 2025-11-04 20:38:24 +01:00
Claire
5ac3cceaf5
Increase number of quote approval job retries (#36698) 2025-11-04 08:29:27 +00:00
Claire
48ec31bec8 Merge commit '4896d2c4c6d3bd6b878c5a075b6611c65d4203b2' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream changed stuff too close to glitch-soc's theming system changes.
  Applied upstream's changes.
- `streaming/index.js`:
  Upstream refactored a bunch of stuff where our code was different due to
  local-only posts.
  Applied upstream's changes while taking care of local-only posts.
 2025-10-28 22:10:12 +01:00
Renaud Chaput
795aaa14bf
Remove environment variables to config Fetch All Replies behaviour (#36627) 2025-10-28 15:58:18 +00:00
Claire
209434cb1d Merge commit '17eb1a7e668dbba6e79612395b99407e8e8de6b9' into glitch-soc/merge-upstream 2025-10-21 18:15:56 +02:00
Claire
17eb1a7e66
Fix scheduled quote posts being posted as non-quote posts (#36550) 2025-10-21 16:00:40 +00:00
Claire
490c89a5a9 Merge commit 'c858fc77ef194be0217fd98eae84efd261dba798' into glitch-soc/merge-upstream 2025-10-09 17:59:13 +02:00
Claire
b7c5e60426
Fix quote post state sometimes not being updated through streaming server (#36408) 2025-10-09 09:53:45 +00:00
Claire
b6c53c1129 Merge commit '150f0fcba5585782e2cac49d971904f02d5e6fbd' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/follower_accounts_controller.rb`:
  Upstream refactored a part of the code where glitch-soc has changed the code
  to potentially hide followers count.
  Adapt upstream's changes.
 2025-09-29 18:41:46 +02:00
Claire
150f0fcba5
Add support for numeric-based URIs for local accounts (#32724) 2025-09-29 12:05:48 +00:00
Claire
9f97df84da Merge commit '45a996f12b04f88e0774bc6d6b52452ce39b612f' into glitch-soc/merge-upstream 2025-09-11 21:20:15 +02:00
Claire
aacc829dc6
Fix missing memoization in Web::PushNotificationWorker (#36085) 2025-09-11 12:32:56 +00:00
Claire
6fc9febb47 Merge commit '1b664cf20dbb696cf16a42efcf59ab186cb211eb' into glitch-soc/merge-upstream 2025-09-05 20:03:42 +02:00
Emelia Smith
4c2a2c27c1
Automatically remove invalid Web::PushSubscriptions (#35987) 2025-09-04 08:00:44 +00:00
Claire
884d7996b1 Merge commit '02de05dc272856c77fac5c9e1d84cf585ae20c1e' into glitch-soc/merge-upstream 2025-08-27 18:13:03 +02:00
Claire
c00ed9c913
Add digest re-check before removing followers in synchronization mechanism (#34273) 2025-08-27 12:12:55 +00:00
Claire
7e25f6b606 Merge commit '6ad0ddebe4be9fb76b9119924674b4679e8da74a' into glitch-soc/merge-upstream 2025-08-26 19:07:52 +02:00
Claire
f3a932d8a1
Add quoted_update notification type (#35820) 2025-08-25 15:44:18 +00:00
Claire
71cee3e472 Merge commit 'f16f8b51b863d3fcadd17753004adbf8962ead01' into glitch-soc/merge-upstream 
Conflicts:
- `yarn.lock`:
  Upstream updated a dependency adjacent to one that is only in glitch-soc.
  Updated as upstream did.
 2025-08-19 18:46:12 +02:00
Claire
831a24ae15
Fix self-destruct scheduler behavior on some Redis setups (#35823) 2025-08-19 14:16:30 +00:00
Claire
8d602df786 Merge commit '72bd1ed4b3df9188a1ad3e664c86fe2e928bd134' into glitch-soc/merge-upstream 2025-08-18 13:44:06 +02:00
Claire
4d9150735a Merge commit '651e51a82eba542c4d8c3fec5edd16420ea1ff3e' into glitch-soc/merge-upstream 
Conflicts:
- `yarn.lock`:
  Upstream updated a dependency textually adjacent to a glitch-soc-specific one.
  Updated the dependency as upstream did.
 2025-08-17 20:52:34 +02:00
Matt Jankowski
4de21056ff
Update sidekiq to version 8.0.7 (#34824) 2025-08-14 15:25:31 +00:00
Matt Jankowski
5ee83a680b
Update stoplight to version 5.3.1 (#35129) 2025-08-12 08:15:22 +00:00