tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
26,141 Commits 5 Branches 0 Tags
6a71fffadfc0bb069166b2ed2da93e46a8d76c2f
Commit Graph
1089 Commits
Author SHA1 Message Date
Claire 6abe6cdef5 Merge commit '40242fafee83cf9a6bcb2d0ac1e228827969402f' into glitch-soc/merge-upstream 2025-08-29 18:21:28 +02:00
Matt Jankowski ee4b0a223c Add coverage for Relay model (#35950) 2025-08-29 15:18:52 +00:00
Claire 4fa203e69e Rename unknown quote policy value to unsupported_policy (#35955) 2025-08-29 13:50:37 +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 a44b4e220e Merge commit 'f6e822e1f5c18553db246991ebfb8658acaef59f' into glitch-soc/merge-upstream 2025-08-24 11:43:25 +02:00
Matt Jankowski 20bc34ca52 Rely on pluck for the SELECT in RuleTranslation.languages (#35826) 2025-08-22 23:58:40 +00: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 b827a0a6a8 Allow CustomEmoji to normalize its own domain (#35726) 2025-08-11 07:33:36 +00:00
Claire 11902d958f Merge commit 'ce1680e6f979889ebd5c775353f3b82a8b2698bb' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/concerns/user/has_settings.rb`:
  Upstream added a new helper for a setting, where glitch-soc had extra ones.
  Not a real conflict, added upstream's new helper without removing glitch-soc's ones.
 2025-08-09 23:02:43 +02:00
David Roetzel 868c46bc76 Add delivery failure handling to FASP jobs (#35723) 2025-08-08 09:46:09 +00:00
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 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
Matt Jankowski 6e48322055 Add spec for CanonicalEmailBlock.matching_email scope (#35692) 2025-08-06 12:19:43 +00:00
Matt Jankowski 4c2ddbf2c4 Update rubocop to version 1.79.2 (#35688) 2025-08-06 08:42:53 +00:00
Claire 53185f5381 Merge commit '081d38679f965ac20ff1a6c72e2fc1108c34ac30' into glitch-soc/merge-upstream 2025-08-04 21:24:47 +02:00
David Roetzel eb273f904f Make WorkerBatch spec more robust (#35656) 2025-08-04 14:04:40 +00:00
David Roetzel 05cdd3f6eb Track delivery failures to FASP (#35628) 2025-08-04 07:43:34 +00:00
Claire e53421b548 Merge commit 'e5826777b6c06a32b97388657beaca1e5eccb421' into glitch-soc/merge-upstream 
Conflicts:
- `config/settings.yml`:
  Not a real conflict, upstream removed settings that are identical in glitch-soc
  but textually adjacent to glitch-soc-only settings.
  Removed what upstream removed.
 2025-07-30 20:05:45 +02:00
Claire e5826777b6 Fix friends-of-friends recommendations suggesting already-requested accounts (#35604) 2025-07-30 16:28:26 +00:00
Matt Jankowski e8e6cf9510 Add coverage to user spec for missing last_sign_in_at scenario (#35587) 2025-07-30 13:46:58 +00:00
Matt Jankowski 3146109b08 Add MediaAttachment.combined_media_file_size method (#35570) 2025-07-30 12:57:51 +00:00
Matt Jankowski 7e6b134222 Extract User::Activity concern (#35581) 2025-07-30 11:19:11 +00:00
Matt Jankowski 6dc55a2f4e Extract User::Confirmation concern (#35582) 2025-07-30 10:33:57 +00:00
Eugen Rochko 20bbd20ef1 Add ability to block words in usernames (#35407) 2025-07-29 10:19:15 +00:00
Eugen Rochko 8cf7a77808 Fix async refresh never being finished when status cannot be fetched (#35500) 2025-07-29 09:23:32 +00:00
Matt Jankowski 040a638ab9 Fix Style/GuardClause in Tag (#35522) 2025-07-28 08:54:29 +00:00
Matt Jankowski 7cd3738c19 Add with_list_account scope to List model (#35539) 2025-07-28 08:26:29 +00:00
Matt Jankowski 9d0d6f011c Add coverage for AnnouncementReaction model (#35543) 2025-07-28 07:59:32 +00:00
Claire 8649681c51 Merge commit 'e93efe0e131481635e88d7ad114ef66148626f90' into glitch-soc/merge-upstream 
Conflicts:
- `app/serializers/activitypub/note_serializer.rb`:
  Conflict because upstream added context extensions where glitch-soc had its own.
  Added upstream's new context extension while keeping ours.
 2025-07-25 21:45:00 +02:00
Claire 5a88b7f683 Add experimental basic quote post authoring (#35355) 2025-07-25 12:35:24 +00:00
Claire 72affd6b45 Merge commit 'a863e68d174b176dc350d8e3472c010cd37b7807' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/trends/statuses.rb`:
  Conflict because of glitch-soc's setting to allow CWs in trends.
  Kept glitch-soc's setting but followed upstream's refactor.
- `docker-compose.yml`:
  Conflict because of upstream VS glitch-soc repos.
  Updated version number as upstream did, but kept glitch-soc repos.
 2025-07-24 18:10:38 +02:00
Claire a863e68d17 Add restrictions on which quote posts can trend (#35507) 2025-07-24 15:45:12 +00:00
Claire 63af7ecb1f Merge commit '7d3ef27a8dc8fb281bae959b245d3db63aa82260' into glitch-soc/merge-upstream 2025-07-23 18:43:56 +02:00
Eugen Rochko 14a781fa24 Add button to load new replies in web UI (#35210) 2025-07-23 13:42:07 +00:00
Claire eeffe580d8 Merge commit '74fc4dbacf5a9168074e91fc2d75309dc42ff1ed' into glitch-soc/merge-upstream 2025-07-15 18:19:32 +02:00
Matt Jankowski 0efb889a9c Extract constant for attribution domains limit in account (#35350) 2025-07-15 13:08:24 +00:00
Matt Jankowski 30344d6abf Confirm User#login_activities in auth/sessions spec (#35372) 2025-07-15 06:31:00 +00:00
Matt Jankowski 1637297085 Add coverage for CustomFilterStatus model (#35374) 2025-07-15 06:28:40 +00:00
Matt Jankowski dec1fb71f4 Add coverage for FollowRecommendationMute model (#35376) 2025-07-15 06:27:36 +00:00
Claire 1716f8da71 Merge commit '3b52dca4057560c58b260433722d91650fcd5040' into glitch-soc/merge-upstream 
Conflicts:
- `app/serializers/initial_state_serializer.rb`:
  Upstream added a `features` attribute where glitch-soc had extra ones.
  Added `features` like upstream did.
 2025-07-11 18:53:47 +02:00
Matt Jankowski 1496488771 Add Status#not_replying_to_account scope for annual report classes (#35257) 2025-07-10 07:35:04 +00:00
Matt Jankowski 4ecfbd3920 Add Status.only_polls (and without polls) scope (#35330) 2025-07-10 07:13:22 +00:00
Claire 3efc857fbc Merge commit '8ee6cee36e313fcc39763210dfcd3b871b47cacb' into glitch-soc/merge-upstream 2025-07-08 16:41:01 +02:00
Matt Jankowski bdffdcb12f Remove unused scopes in Account model (#35276) 2025-07-07 08:07:01 +00:00
Matt Jankowski e8d2432e6a Fix intermittent failure of TOS model spec from effective date collision (#35244) 2025-07-03 16:28:47 +00:00
Claire 2eec4da8fc Merge commit 'c357a7f8d697ede4df4be74456b0497118c9d049' into glitch-soc/merge-upstream 2025-06-30 17:52:22 +02:00
David Roetzel bae258925c Persist follow recommendations from FASP (#35218) 2025-06-30 13:39:36 +00:00
Matt Jankowski 964916c71b Add coverage for TermsOfService scopes/validations (#35204) 2025-06-30 10:28:14 +00:00