tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
25,915 Commits 5 Branches 0 Tags
e68de292b41fd8a9ad2e032c2079d8286992a2db
Commit Graph
25915 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Claire e68de292b4 Merge commit 'a485f97d21c3fb7da927e8fd239b301a590ee9b8' into glitch-soc/merge-upstream 2025-08-07 18:16:54 +02:00
Matt Jankowski a485f97d21 Replace EmailHelper module with normalizes via model concern (#35702) 2025-08-07 13:47:47 +00:00
Claire 496a5f423e Inline instrument quote post in outgoing QuoteRequest activities (#35713) 2025-08-07 13:19:18 +00:00
Claire 836a2bfee0 Fix handling of inlined instrument in incoming QuoteRequest (#35714) 2025-08-07 12:52:29 +00:00
github-actions[bot]andGitHub Actions 39a3ffaf2f New Crowdin Translations (automated) (#35708) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-08-07 08:46:11 +00:00
Claire d4e0784182 Fix quote revocation not being streamed (#35710) 2025-08-07 08:03:15 +00:00
Claire e615d2f069 Change quote to be fetched with quoted account rather than random follower (#35709) 2025-08-07 08:02:29 +00:00
Claire 9ddb9739d1 Merge pull request #3154 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to ac59772dc6
 2025-08-06 23:31:58 +02:00
Claire 9da8c9e07c [Glitch] Bundle quotes and mentions in the same quickfilter bar since quotes don't have their own icon 
Port 4838085d66 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-08-06 22:43:44 +02:00
Claire 4b507c0f05 [Glitch] Add UI for revoking quote posts 
Port 55a98580aa to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-08-06 22:43:44 +02:00
Claire dbb2908eeb [Glitch] Fix quote notification filtering and add settings 
Port a4c05c694f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-08-06 22:34:14 +02:00
Claire 235037a3b2 Merge commit 'ac59772dc6cda646258e61debfd792f9057c1c39' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/api/v1/statuses_controller.rb`:
  Conflict because upstream added a parameter where glitch-soc had an extra one.
  Added upstream's parameter while keeping glitch-soc's.
- `app/serializers/activitypub/note_serializer.rb`:
  Conflict because upstream added an extension where glitch-soc had an extra one.
  Added upstream's extension while keeping glitch-soc's.
- `app/services/update_status_service.rb`:
  Conflict because upstream added a parameter where glitch-soc had an extra one.
  Added upstream's parameter while keeping glitch-soc's.
 2025-08-06 22:02:55 +02:00
Claire ac59772dc6 Change icon of quote notification mails (#35701) 2025-08-06 15:20:16 +00:00
Claire 4838085d66 Bundle quotes and mentions in the same quickfilter bar since quotes don't have their own icon (#35700) 2025-08-06 14:54:03 +00:00
Claire 9ec99ffef1 Add quote_approval_policy parameter when posting and editing statuses (#35699) 2025-08-06 14:23:12 +00:00
Matt Jankowski 6e48322055 Add spec for CanonicalEmailBlock.matching_email scope (#35692) 2025-08-06 12:19:43 +00:00
Claire 55a98580aa Add UI for revoking quote posts (#35689) 2025-08-06 11:52:56 +00:00
Claire c8f263c419 Export interaction policies for local posts over ActivityPub (#35697) 2025-08-06 11:31:36 +00:00
github-actions[bot]andGitHub Actions 6f6e7d8d49 New Crowdin Translations (automated) (#35694) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-08-06 09:06:22 +00:00
renovate[bot] fcbd4b7afb Update dependency annotaterb to v4.18.0 (#35676) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-08-06 08:43:14 +00:00
Matt Jankowski 4c2ddbf2c4 Update rubocop to version 1.79.2 (#35688) 2025-08-06 08:42:53 +00:00
Claire a4c05c694f Fix quote notification filtering and add settings (#35690) 2025-08-05 16:15:16 +00:00
Matt Jankowski a968849e9c Use normalizes api for UsernameBlock username change (#35606) 2025-08-05 14:10:28 +00:00
Claire 5c1456c97f Merge pull request #3153 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to ffeb5da991
 2025-08-05 16:08:50 +02:00
Claire 3f166bb068 Merge commit 'ffeb5da9912a3b7db0deb8aec429e661ef609c59' into glitch-soc/merge-upstream 2025-08-05 15:46:33 +02:00
Claire ffeb5da991 Bump version to v4.4.3 (#35687) 2025-08-05 13:32:20 +00:00
Claire edece2a197 Merge commit from fork 2025-08-05 14:53:04 +02:00
Claire 1fd3510b32 Change the quote revocation REST API endpoint to return updated quote post (#35677) 2025-08-05 09:42:58 +00:00
renovate[bot] 9c0a10f662 Update dependency capybara-playwright-driver to v0.5.7 (#35675) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-08-05 08:19:58 +00:00
github-actions[bot]andGitHub Actions 54fd1c1f9b New Crowdin Translations (automated) (#35674) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-08-05 08:19:55 +00:00
Matt Jankowski 8131268256 Replace unprocessable_entity -> unprocessable_content (#35658) 2025-08-05 07:42:08 +00:00
Claire ad499db397 Merge pull request #3149 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 081d38679f
 2025-08-04 22:59:08 +02:00
Claire 5318957ab3 Fix serialization of quote post notification groups (#35670) 2025-08-04 20:58:59 +00:00
Claire 98685f744d [Glitch] Add quote notifications to WebUI 
Port 081d38679f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-08-04 21:33:45 +02:00
Echo 3fc07508ee [Glitch] Performance regression fixes 
Port 570c9d16be to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-08-04 21:26:57 +02:00
Echo b8f66e1d33 [Glitch] Provides legacy fallback for browser that don't support regex flag v 
Port 28b0e5ee78 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-08-04 21:26:23 +02:00
Claire a6f0ec160e [Glitch] Fix WebUI crashing for accounts with null URL 
Port 3caa318dfe to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2025-08-04 21:25:46 +02:00
Claire 53185f5381 Merge commit '081d38679f965ac20ff1a6c72e2fc1108c34ac30' into glitch-soc/merge-upstream 2025-08-04 21:24:47 +02:00
Claire 081d38679f Add quote notifications to WebUI (#35653) 2025-08-04 18:12:37 +00:00
Echo 570c9d16be Performance regression fixes (#35664) 2025-08-04 17:16:12 +00:00
Echo 28b0e5ee78 Provides legacy fallback for browser that don't support regex flag v (#35659) 2025-08-04 17:15:46 +00:00
Claire cb0b608fa7 Ensure quoted user is given access to see the post (#35665) 2025-08-04 16:06:59 +00:00
Claire 32791c9745 Accept remote quotes of local quotes according to set policy (#35629) 2025-08-04 15:27:46 +00:00
Claire 0153a239db Avoid nested transactions when fetching quote posts (#35657) 2025-08-04 14:34:05 +00:00
renovate[bot] 49dcbd22d6 Update eslint (non-major) (#35661) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2025-08-04 14:19:48 +00:00
Claire 5ed9410de0 Disable ActiveRecord query cache in Create critical path (#35662) 2025-08-04 14:15:02 +00:00
David Roetzel eb273f904f Make WorkerBatch spec more robust (#35656) 2025-08-04 14:04:40 +00:00
Eugen Rochko d8397040d7 Fix allow with approval option not working on username blocks (#35655) 2025-08-04 13:10:19 +00:00
Eugen Rochko c8ec649830 Fix "new replies available" miscounting previously known replies (#35654) 2025-08-04 12:49:17 +00:00
Claire 80aadc55df Add missing mailer for quote notifications (#35652) 2025-08-04 10:44:59 +00:00