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

4404 Commits

Author SHA1 Message Date
Claire
06176deee2 Merge commit 'd20d04922672ed016029c40ed64798f341ebca91' into glitch-soc/merge-upstream 2026-05-26 20:48:49 +02:00
diondiondion
e1aa4e3a8c
Accessibility: Add landmark regions to Web UI (#39133) 2026-05-26 10:22:22 +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
Claire
aaf06a8186 Merge commit '6f8558a6b96041541d911439421563c1e9e7b3f4' into glitch-soc/merge-upstream 2026-05-20 11:31:39 +02:00
David Roetzel
22203f8aeb
Improve collection item verification (#39096) 2026-05-20 07:55:17 +00:00
Claire
0c80bf0e82 Merge commit 'fcf012c6026418b6c76bff173eec944e0c25913f' into glitch-soc/merge-upstream 
Conflicts:
- `vite.config.mts`:
  Upstream changed a line adjacent to one glitch-soc modified due to its theming system.
  Adapted upstream's change.
- `yarn.lock`:
  Upstream updated a dependency next to one glitch-soc added.
  Updated the dependency as upstream did.
 2026-05-19 20:40:57 +02:00
Matt Jankowski
1232b55211
Use mime type symbol to set content_type for custom css response (#37845) 2026-05-19 07:16:24 +00:00
Matt Jankowski
5f33cf0b0a
Extract api/v1/statuses#context to standalone controller (#38348) 2026-05-19 07:15:35 +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
Matt Jankowski
0ef5dca3c8
Remove flatware config block, re-extract simplecov config to standalone file (#39017) 2026-05-13 14:46:46 +00:00
Claire
4fcc9b8a40 Merge commit 'd2f640272f3f36c8979cff645416682840528906' into glitch-soc/merge-upstream 2026-05-12 18:37:31 +02:00
Pia B.
7c05f56fe8
Add batch actions to collections and possibility to report multiple collections (#38991) 2026-05-12 16:13:01 +00:00
Matt Jankowski
a547dfff37
Move flatware setup into rails_helper (#38944) 2026-05-12 13:12:49 +00:00
David Roetzel
b1f7c9641f
Fix updating collection items when position is unknown (#38962) 2026-05-11 06:08:44 +00:00
Claire
99f0a03dec Merge commit 'b2aa476abbe82e2b49d84c9fb8ef654f95391fd3' into glitch-soc/merge-upstream 2026-05-07 18:26:17 +02:00
Claire
b2aa476abb
Redirect with interstitial when trying to view a remote collection while logged out (#38941) 2026-05-07 16:04:26 +00: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
Pia B.
1a2038775c
Add ability to search email blocks by domain (#38923) 2026-05-06 15:54:12 +00:00
Matt Jankowski
65b7ddb3e8
Add failing service case to remote account refresh worker spec (#38922) 2026-05-06 15:10:12 +00:00
David Roetzel
f6f45c43a9
Add partial accounts to collections endpoint (#38919) 2026-05-06 15:08:26 +00:00
David Roetzel
07ce066d68
Move PartialAccountSerializer to the top-level (#38916) 2026-05-06 09:35:07 +00:00
Matt Jankowski
d243ba36ce
Add admin area spec for email subscriptions management (#38912) 2026-05-06 08:47:12 +00:00
Matt Jankowski
aee0025ca3
Add system spec for managing everyone user role 2FA (#38911) 2026-05-06 08:36:42 +00:00
Claire
80a452220c Merge commit 'cb2e7705848e602b7cdc513560004715134b10d4' into glitch-soc/merge-upstream 2026-05-05 18:01:14 +02:00
Claire
3bc27b9b64
Resolve unknown tagged collections in remote posts (#38900) 2026-05-05 14:46:47 +00:00
Claire
6935fce458 Merge commit 'ba83509ff4ed3f7193f3ca5c5deb3038c39620b1' into glitch-soc/merge-upstream 2026-05-04 21:08:25 +02:00
Eugen Rochko
ee88da4511
Add admin UI for managing email subscriptions (#38741) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2026-05-04 13:56:04 +00:00
Matt Jankowski
696aaa616b
Update rubocop-capybara to version 2.23.0 (#38868) 2026-05-04 07:52:29 +00:00
Claire
44394878a4 Merge commit 'c6facd27ed191177afb003640b8ee7d0742c7f63' into glitch-soc/merge-upstream 2026-04-30 19:00:48 +02:00
Matt Jankowski
59f3d8a993
Handle IPv6 scenario in custom Request::Socket (#38866) 2026-04-30 16:03:55 +00:00
Claire
5b395774c0
Add fallback attributes to notifications for new and infrequent notifications (#38832) 2026-04-29 15:53:29 +00:00
David Roetzel
6c5bd4f9a8
Handle collections when blocking a user (#38827) 2026-04-28 14:49:19 +00:00
David Roetzel
1f1653e039
Remove rejected and revoked collection items (#38792) 2026-04-28 11:10:25 +00:00
David Roetzel
d5f8b08d69
Add collections to Flag activities (#38817) 2026-04-28 11:09:43 +00:00
Claire
57017329a4 Merge commit '2dd630bc581dfd73950b45f6c3b1f47619b7ea6c' into glitch-soc/merge-upstream 2026-04-27 20:18:51 +02:00
David Roetzel
2dd630bc58
Only update FASP availability if it actually changed (#38818) 2026-04-27 13:15:53 +00:00
Claire
b3bae7e78f Merge commit '3473b8a65278783bc74ce2738aea98cca0c7a5ed' into glitch-soc/merge-upstream 
Conflicts:
- `config/settings.yml`:
  Upstream added a new setting textually adjacent to ones modified by glitch-soc's.
  Added upstream's new setting.
 2026-04-25 09:20:39 +02:00
David Roetzel
fdb2563abf
Use /collections/:id as canonical URL for a collection (#38783) 2026-04-23 07:36:35 +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