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

4439 Commits

Author SHA1 Message Date
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
b48f907b20
Add Deprecation headers to collections alpha API (#39349) 2026-06-09 15:40:01 +00:00
David Roetzel
200fda1cdc
Add collection reach finder (#39346) 2026-06-09 14:22:21 +00:00
Matt Jankowski
e9697922c1
Handle offset relative to TZ in options list (#39334) 2026-06-09 12:58:45 +00:00
Evan Prodromou
9c493c20b9
Add policy to filter notifications from bots (#38494) (#38809) 2026-06-09 12:28:53 +00:00
Matt Jankowski
fef5a501cc
Add coverage for rules acceptance and invite code handling (#39310) 2026-06-09 09:54:38 +00:00
Matt Jankowski
4f062c8c7b
Fix intermittent failure with order dependent RankedTrend locales pluck (#39338) 2026-06-09 08:52:38 +00:00
Nicholas La Roux
4a5a915e86
Migrate a few tests to use NotificationAssertions (#38098) 2026-06-08 16:01:20 +00:00
Matt Jankowski
fc64804b4d
Update rubocop-rspec to version 3.10.1 (#39303) 2026-06-08 15:27:34 +00:00
Matt Jankowski
bc7e0543a3
Add coverage for email subscription account controls (#39333) 2026-06-08 15:04:02 +00:00
David Roetzel
cf09247945
Check type of featured item and skip unsupported ones (#39327) 2026-06-08 15:03:23 +00:00
Claire
1b5b83114a Fix test that was broken because of different glitch-soc default settings 2026-06-07 15:17:40 +02: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
Matt Jankowski
4957a4fb50
Exercise ip block comment path in admin area (#39292) 2026-06-05 07:54:34 +00:00
Matt Jankowski
ada6e1339d
Exercise more of disputes/strikes/_card partial (#39265) 2026-06-04 14:45:14 +00:00
Matt Jankowski
8d9a7aa50b
Exercise more of tags/show.rss view (#39269) 2026-06-04 08:38:33 +00:00
Claire
a1ab96baed Merge commit '52aa8a44bbd0c9a6673cbd9b7c088020be938799' into glitch-soc/merge-upstream 2026-06-03 22:30:16 +02:00
Matt Jankowski
65622a52e1
Exercise more of rule_translations/_rule_translation partial (#39266) 2026-06-03 13:22:01 +00:00
David Roetzel
c5432e3a09
Remove featuredObjectType property (#39260) 2026-06-03 13:01:32 +00:00
Claire
659a077616 Merge commit '07236016bcc78a82205093b3e067bf4a1bb07d88' into glitch-soc/merge-upstream 2026-06-03 12:19:05 +02:00
Pia B.
07236016bc
Merge commit from fork 
* add guard clause to check for node attributes

* check for encoding attribute specifically

* check for encoding attribute specifically

* change spec
 2026-06-03 12:12:37 +02: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
zunda
423d0ca875
Extract text from language tagged strings for link preview (#39190) 2026-06-01 15:10:08 +00:00
Matt Jankowski
8d4f9a97fe
Move by_domain/local interaction check to filter (#39216) 2026-06-01 14:52:19 +00:00
Matt Jankowski
95bc6f0139
Move simplecov start to config and require to spec_helper (#39236) 2026-06-01 13:37:17 +00:00
Pia B.
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
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
Matt Jankowski
e2754b0bc2
Unify queue_mail and mail in admin mailer new trends spec (#39207) 2026-05-29 09:16:19 +00:00
David Roetzel
6d3182a6eb
Move Collections API to v1 namespace (#39210) 2026-05-29 08:39:51 +00:00
Pia B.
8a9ea06dee
fixes bug Admin Mailer trends mail not displayed correctly (#39122) 2026-05-28 20:14:31 +00:00
David Roetzel
faa5944d46
Hydrate user-specific feature approval policy (#39194) 2026-05-28 19:52:49 +00:00
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