tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
29,670 Commits 5 Branches 0 Tags
3a973e4dddef4e459d0efb2cd0ebee7b09cacd62
Commit Graph
3002 Commits
Author SHA1 Message Date
Claire 222dfdf233 Merge commit '8f1847df31f5195abb427854fa1e2bf1e8ba23a0' into glitch-soc/stable-4.6 2026-09-15 15:29:20 +02:00
Claire cca43ce5d3 Fix canonical email blocks interfering with freezing or approving users (#40463) 2026-09-15 10:23:32 +02:00
Claire f6ad213192 Fix account deletion not deleting generated annual reports (#40394) 2026-09-15 10:23:32 +02:00
Claire 3a5da4cb92 Merge commit '5e1ec8b18a48b36b0fc66f04292df9c519b21883' into glitch-soc/stable-4.6 2026-09-01 16:07:09 +02:00
Claire f7cf4e4dd2 Fix GHSA-vx32-x96w-qq65 2026-09-01 14:33:36 +02:00
Claire c787435a21 Fix invited-without-approval-bypass not being asked for a textual reason (#40332) 2026-09-01 14:30:52 +02:00
Claire 1403a21fe8 Merge commit 'd74bbd9a3c64740433e016dfc936e83d710858f6' into glitch-soc/merge-4.6 2026-08-13 18:41:35 +02:00
Claire b4121ff003 Wrap connection errors in Webfinger#perform (#40135) 2026-08-13 14:42:43 +02:00
Claire 53bad36955 Merge commit '1440d55b139e39ec722c2a3db7f60b66cd889048' into glitch-soc/merge-4.6 2026-08-06 18:09:08 +02:00
Shlee 92162c4113 Fix missing AccountWarning from merging.rb (#39982) 2026-08-06 11:41:22 +02:00
David Roetzel 07a8dfa32c Improve enforcement of collection item limit (#39969) 2026-08-06 11:41:22 +02:00
Claire 5ed695d4f3 Merge commit '35fce54cc29466b848eef9b721be810f77fd78f2' into glitch-soc/merge-4.6 
Conflicts:
- `app/lib/activitypub/parser/status_parser.rb`:
  Upstream refactored this class while glitch-soc had an additional method.
  Moved the private methods as upstream did while keeping glitch-soc's extra one.
- `spec/lib/activitypub/activity/create_spec.rb`:
  glitch-soc had extra tests.
  Added upstream's new tests alongside the glitch-soc-specific ones.
 2026-07-22 18:58:43 +02:00
Claire f90b89b7a9 Fix Account::Merging concern not supporting Quotes or Collections, refactor it (#39884) 2026-07-21 14:41:15 +02:00
Claire f8fb62193a Merge commit 'eeb68053a83894190eefae178a661018b9859494' into glitch-soc/merge-4.6 2026-07-03 18:14:36 +02:00
Claire f4cdbb9015 Add “Update available” navigation item at top of navbar when new Mastodon versions are available (#39705) 2026-07-03 14:38:32 +02:00
Claire 8941f1f98c Merge commit '06d64519da4c6fc50536744f0d950dae22c6e2b9' into glitch-soc/merge-4.6 2026-07-02 18:31:59 +02:00
Claire 94b897fdee Fix incorrect filter cache key sometimes causing incorrect filters to be applied (#39698) 2026-07-02 14:14:43 +02:00
Claire 2f491f0d48 Merge commit 'b5e771b89e7b55b9feb301d257e2d4dc7ca46c1d' into glitch-soc/merge-4.6 
Conflicts:
- `lib/mastodon/version.rb`:
  Upstream bumped the Mastodon API version.
   Did it as well.
 2026-06-23 18:01:59 +02:00
David Roetzel b06e9f5a5e LDAP: Fix attempted modification of frozen hash (#39571) 2026-06-23 17:35:29 +02:00
Claire 6b4e8c7467 Merge commit 'e8642389912b1059c921f0836825f12a0f2779db' into glitch-soc/merge-4.6 
Conflicts:
- `app/models/account.rb`:
  Upstream changed the display name length limit for local users,
  but glitch-soc has a configurable limit.
  Updated the default limit to be upstream's new limit.
 2026-06-17 14:40:25 +02:00
Matt Jankowski 8ea7732343 Relax account display name length limit (#39458) 2026-06-17 12:09:12 +02:00
Claire 6aca68e185 Merge commit 'e2b7096bd3f93afcf4d6b3e7ffb9ccdb417a9def' into glitch-soc/merge-4.6 2026-06-16 21:49:17 +02:00
David Roetzel dc53b0e077 Destroy dependent notifications of a collection (#39429) 2026-06-15 17:01:10 +02:00
Claire 61c56d4fd3 Merge pull request #3486 from ClearlyClaire/glitch-soc/drop-local-emoji 
Completely drop support for the infamous local-only emoji
 2026-06-12 19:16:32 +02:00
Claire 08027edb10 Merge commit 'b902c825054b953599cd0341acf428332fca5044' into glitch-soc/merge-upstream 2026-06-12 18:37:02 +02:00
Pia B. 35f3748482 Add import for custom filters (#39256) 2026-06-11 16:32:46 +00:00
Claire 89c2ac444f Merge commit '9e0a3aaf08e7d4fc700f7f19d61f5f8fee346b6a' into glitch-soc/merge-upstream 2026-06-10 18:52:58 +02:00
ShleeandClaire c6e2e2255c Fix missing boolean check in Admin Reports API (#39197) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2026-06-10 13:40:59 +00:00
Claire e08c8b6933 Merge commit 'b48f907b20e2c9909665a484041845697d26f17c' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/settings_helper.rb`:
  Upstream added a new helper.
  Conflict caused by the fact there is a glitch-soc specific helper.
  Added upstream's new helper in addition to glitch-soc's.
 2026-06-09 21:30:54 +02:00
David Roetzel 200fda1cdc Add collection reach finder (#39346) 2026-06-09 14:22:21 +00:00
Shlee a2064d4c7f Add sign? methods to the Quote and CollectionItem models (#39047) 2026-06-09 12:49:42 +00:00
Evan Prodromou 9c493c20b9 Add policy to filter notifications from bots (#38494) (#38809) 2026-06-09 12:28:53 +00:00
Claire c4ea89dfd9 Change media attachment limit to 10000 characters (#39306) 2026-06-08 14:03:56 +00:00
Claire c2e6cbb12b Merge commit 'ead13d4826a7ba1699d6bb310e58642b15687671' into glitch-soc/merge-upstream 2026-06-07 14:29:57 +02:00
Pia B. ead13d4826 fix naming of custom filter export param (#39304) 2026-06-05 16:02:20 +00:00
Claire 3cf0fb7ba0 Merge commit 'facb552c9cdbe8a2ebff0b94ebf2c9e9ec385347' into glitch-soc/merge-upstream 2026-06-01 18:00:03 +02:00
Matt Jankowski 8d4f9a97fe Move by_domain/local interaction check to filter (#39216) 2026-06-01 14:52:19 +00:00
Claire 89d9fc8889 Remove ignored_columns for columns removed in pre-4.2.0 migrations (#39237) 2026-06-01 14:40:03 +00:00
Pia B.andClaire f6c156197e Add export for custom filters (#39085) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2026-06-01 09:56:17 +00:00
Claire 06176deee2 Merge commit 'd20d04922672ed016029c40ed64798f341ebca91' into glitch-soc/merge-upstream 2026-05-26 20:48:49 +02:00
Eugen Rochko 07d099cbf7 Add new overview landing page setting (#39074) 2026-05-26 12:36:54 +00:00
nicole mikołajczyk 6b2616453f Make it possible to retrieve both resolved and unresolved reports by api (#38323) 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
 2026-05-23 11:07:02 +00:00
Claire 487c814eb9 Merge commit '6a4d14b178fc00de989b4a2758f2a1e4adf5ed33' into glitch-soc/merge-upstream 
Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
  Glitch-soc allows a wider range of HTML than upstream.
  Upstream added `:all => %w(lang)`, which was not supported by glitch-soc,
  added it there too.
 2026-05-22 19:43:42 +02:00
David Roetzel dee85c6df9 Only preload accounts in Collections when needed (#39143) 2026-05-22 10:11:41 +00:00
Claire cdf721a273 Fix remote statuses with large media descriptions being rejected (#39135) 2026-05-21 15:46:10 +00:00
David Roetzel e18ca373eb Revert "Add partial accounts to collections endpoint (#38919)" (#39128) 2026-05-21 13:45:09 +00:00
David Roetzel fe885d5788 Remove superfluous comment (#39123) 2026-05-21 12:10:31 +00:00
Claire 42ec9a607b Merge commit 'c26003af215da7696e2b0dcece7fa695b1be8871' into glitch-soc/merge-upstream 2026-05-18 19:35:08 +02:00
Pia B. 07a05e1edf Add batch remove for collections in reports (#39020) 2026-05-18 14:53:40 +00:00
David Roetzel db304735bf Temporary tweak to account background refresh (#39062) 2026-05-18 10:04:28 +00:00