Daniel M Brasil
8870c0fec6
Fix incorrect pagination headers in /api/v2/admin/accounts ( #25477 )
2026-07-11 13:42:14 -04:00
Claire
e744ccabec
Fix ArgumentError when loading newer Private Mentions ( #25399 )
2026-07-11 13:42:14 -04:00
Claire
8941f1f98c
Merge commit '06d64519da4c6fc50536744f0d950dae22c6e2b9' into glitch-soc/merge-4.6
2026-07-02 18:31:59 +02:00
Matt Jankowski
635764b72f
Add missing to_json to publish announcement reaction worker ( #39685 )
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
David Roetzel
e38abc3801
Add scheduler job to repair collection attribution ( #39550 )
2026-06-23 11:17:55 +02:00
David Roetzel
052d6bb173
Add check for wrong attribution of collections ( #39525 )
2026-06-23 11:17:54 +02:00
David Roetzel
7608436b64
Add route constraint to only allow numeric ids ( #39523 )
2026-06-23 11:17:54 +02:00
Claire
2a80a07854
Fix fetching unknown key when it's not the actor's first, and add error handling for unavailable keys ( #39512 )
2026-06-23 11:17:54 +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
41ea9ad128
Handle missing sw.js in test environment assets ( #39459 )
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
Matt Jankowski
c0ee6f33c5
Add basic coverage for MuteWorker job ( #39384 )
2026-06-12 08:14:46 +00:00
Pia B.
35f3748482
Add import for custom filters ( #39256 )
2026-06-11 16:32:46 +00:00
Claire
bbbbb24dbd
Merge commit '96e23af89258068d05cc8557df914b4a9add385b' into glitch-soc/merge-upstream
2026-06-11 13:26:25 +02:00
Matt Jankowski
b09af1b465
Add basic coverage for EmailDistributionWorker behavior ( #39364 )
2026-06-11 07:54:15 +00:00
Claire
89c2ac444f
Merge commit '9e0a3aaf08e7d4fc700f7f19d61f5f8fee346b6a' into glitch-soc/merge-upstream
2026-06-10 18:52:58 +02:00
Claire
9e0a3aaf08
Resolve links to unknown remote objects when posting ( #38711 )
2026-06-10 15:55:27 +00:00
David Roetzel
008f377a37
Redirect if collection AP ID is requested as HTML ( #39361 )
2026-06-10 15:54:50 +00:00
David Roetzel
70bb70c2e6
Add meta tags to Collection HTML ( #39357 )
2026-06-10 13:28:52 +00:00
Matt Jankowski
c51eb56a90
Clarify preview card CLI command handles media only ( #39348 )
2026-06-10 09:27:07 +00:00
Claire
e697d44144
Fix avatar and profile header descriptions not being serialized over ActivityPub ( #39352 )
2026-06-10 08:46:36 +00:00
Claire
8c50d2fb5e
Fix linting issues
2026-06-09 21:53:09 +02: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
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
