tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
29,666 Commits 5 Branches 0 Tags
ef8caa856bc339a4ff5e2a137cb584526e105980
Commit Graph
1264 Commits
Author SHA1 Message Date
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 53bad36955 Merge commit '1440d55b139e39ec722c2a3db7f60b66cd889048' into glitch-soc/merge-4.6 2026-08-06 18:09:08 +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 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 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 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
Evan Prodromou 9c493c20b9 Add policy to filter notifications from bots (#38494) (#38809) 2026-06-09 12:28:53 +00:00
Nicholas La Roux 4a5a915e86 Migrate a few tests to use NotificationAssertions (#38098) 2026-06-08 16:01:20 +00:00
Claire dd12ed2b98 Merge commit 'd1c26c1e27348278fb8081b290e300b327a61ca1' into glitch-soc/merge-upstream 2026-06-02 18:01:45 +02:00
Matt Jankowski 78932fe567 Add coverage for StatusTrend.allowed method (#39239) 2026-06-02 07:45:08 +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 ae2ff31f32 Merge commit '0caf334891e0a5f4e995f1d667eb83d3aad7e41e' into glitch-soc/merge-upstream 
Conflicts:
- `lib/mastodon/version.rb`:
  Upstream updated the API version, while we also have a custom glitch API version.
  Updated as upstream did.
 2026-05-30 12:13:35 +02:00
David Roetzel 572612fde9 Remove collections feature flag (#39211) 2026-05-29 09:37:42 +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
David Roetzel e18ca373eb Revert "Add partial accounts to collections endpoint (#38919)" (#39128) 2026-05-21 13:45:09 +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
Claire 808b7a858d Merge commit '8bbde181db0d6d79018fb1754a8296e753d47415' into glitch-soc/merge-upstream 2026-05-13 18:42:04 +02:00
David Roetzel 8bbde181db Use the same condition for stale refresh (#39026) 2026-05-13 14:57:25 +00:00
Pia B. 7c05f56fe8 Add batch actions to collections and possibility to report multiple collections (#38991) 2026-05-12 16:13:01 +00:00
Claire 99f0a03dec Merge commit 'b2aa476abbe82e2b49d84c9fb8ef654f95391fd3' into glitch-soc/merge-upstream 2026-05-07 18:26:17 +02:00
David Roetzel 11803e3d04 Relax uniqueness constraint to allow nil (#38934) 2026-05-07 10:08:50 +00:00
Claire 49310aeecf Merge commit '1a2038775c0a999024a615348fcba6240e27b0fa' into glitch-soc/merge-upstream 2026-05-06 21:00:32 +02:00
David Roetzel f6f45c43a9 Add partial accounts to collections endpoint (#38919) 2026-05-06 15:08:26 +00:00
Claire b6abf7a69f Merge commit 'c4eec632b92c800ae38dba111c4c76e63bb1c0de' into glitch-soc/merge-upstream 2026-04-22 20:24:21 +02:00
David Roetzel 1cae543e8f Add per-user maximum number of collections (#38769) 2026-04-22 12:34:08 +00:00
Claire e7ee3a997c Merge commit '28e5c3bb5116d012a1f58b4cbfe1a5fb302ac227' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/theme_helper.rb`:
  Upstream added fallback behavior for when the admin-set theme does not exist.
  Glitch-soc has a different theming system, but already had similar fallback,
  so not changing glitch-soc code.
- `spec/helpers/theme_helper_spec.rb`:
  Upstream adapted existing tests for the new fallback behavior, and added some
  tests accordingly.
  Glitch-soc has a different theming system, adapted the new tests accordingly.
 2026-04-20 18:51:00 +02:00
David Roetzel c0b1fbe0a9 Fix item limit on collections (#38749) 2026-04-20 10:17:12 +00:00
Claire e0a34e6d89 Merge commit 'b15d234ccb5d004180561c440dd45536d70e67b2' into glitch-soc/merge-upstream 2026-04-17 18:06:10 +02:00
Matt Jankowski ea33d7fba6 Add AccountMigration#remaining_cooldown_days method (#38561) 2026-04-17 14:01:07 +00:00
David Roetzel b846f88e16 Improve collection item behavior in REST API (#38732) 2026-04-17 13:28:39 +00:00
Shlee 0e4ee62dfc Fix typo in block_spec.rb (#38714) 2026-04-16 15:59:48 +00:00
Claire 6b1e1899fd Change discoverable accounts to only allow followers to feature them if they are locked (#38672) 2026-04-15 15:05:58 +00:00
Claire ff80786d2e Merge commit 'd9ea631d5911ebfe090e0d1ea1b11441aa58c918' into glitch-soc/merge-upstream 2026-04-15 13:36:46 +02:00
Matt Jankowski 75bbf73737 Make fields build spec resilient to changed size constant (#38678) 2026-04-15 09:29:21 +00:00
Claire cb62beca08 Merge commit 'dc923c6425559266f0665fe2e294f6e412783810' into glitch-soc/merge-upstream 2026-04-02 18:20:01 +02:00
David Roetzel 814cd61fd8 Remove description presence validation on collections (#38528) 2026-04-02 12:56:00 +00:00
Claire 7a4747122e Merge commit 'ca5c0a144ade4bff7bd10446a39d86116879884e' into glitch-soc/merge-upstream 
- `CODE_OF_CONDUCT.md`:
  Adopt upstream's new Code of Conduct
 2026-04-01 19:11:21 +02:00
Claire b5c1a13341 Merge commit '30275cd80e8552d6cbcdeb11f83a4d5028aa6eae' into glitch-soc/merge-upstream 2026-04-01 18:37:21 +02:00