Matt Jankowski
562ea656f4
Add coverage for TagManager#normalize_domain ( #35994 )
2026-01-21 16:11:38 +00:00
Claire
e7c6600d83
Fix cross-server conversation tracking ( #37559 )
2026-01-21 12:02:41 +00:00
Claire
f65e6a5029
Merge commit '10de65e41c3b01bd938f97fdb60fc96c26673966' into glitch-soc/merge-upstream
2026-01-14 20:31:42 +01:00
David Roetzel
c218849204
Add collection endpoint ( #37468 )
2026-01-14 10:08:29 +00:00
Claire
478462ab25
Merge commit 'ed17b3a7ec52c0421ae2483a8e08431316f08b1c' into glitch-soc/merge-upstream
2026-01-12 21:00:14 +01:00
David Roetzel
a9cfddf28e
AP/AS serialization of Collections ( #37434 )
2026-01-12 08:39:25 +00:00
Claire
d7254ecec4
Merge commit 'a4b8b9fe98c677f718e4b2c1ffe1755d58e7f8d7' into glitch-soc/merge-upstream
2026-01-10 13:12:36 +01:00
David Roetzel
aa2110025e
Fix URI generation for reblogs by accounts with numerical AP ids ( #37415 )
2026-01-07 15:39:22 +00:00
Claire
aa6ec435d2
Merge commit '9fe14a30724e18425aedaba59ca63c63d8b14083' into glitch-soc/merge-upstream
2026-01-07 14:53:51 +01:00
Claire
0b1b98c4f2
Merge commit from fork
2026-01-07 14:14:42 +01:00
Claire
04f4725249
Merge commit '0231b6d350d6027fa822f286732405b573d634e8' into glitch-soc/merge-upstream
2025-12-19 18:43:09 +01:00
David Roetzel
4e63958914
Federated "featureable in collections" preference ( #37298 )
2025-12-19 13:44:27 +00:00
Claire
84feffd6e6
Merge commit '009275e66b55729f754da7b4c814b37b67dc76dc' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/form/admin_settings.rb`:
Upstream added a method right next to glitch-soc-only methods.
Added upstream's method.
- `app/views/settings/preferences/appearance/show.html.haml`:
Upstream changed a line right next to a glitch-soc addition.
Changed the code as upstream did.
2025-12-17 18:27:14 +01:00
David Roetzel
5e8b8f9c23
Extract interaction policy class ( #37277 )
2025-12-17 10:12:43 +00:00
Claire
53617cef5a
Merge commit 'd730f6b0c5cfb18894d1a9e34d0aa2556dda3c62' into glitch-soc/merge-upstream
2025-12-11 18:05:28 +01:00
Claire
addeb28292
Change wrapstodon 2025 to allow unlisted posts in top statuses ( #37206 )
2025-12-11 16:35:35 +00:00
Claire
17ba99e5de
Merge commit 'd6f2a3ac8d61e0828a17f68a6e9094d0f4662f4c' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/wrapstodon/show.html.haml`:
Conflict because of glitch-soc's theming change.
Adapted upstream's changes.
- `docker-compose.yml`:
Conflict because of container repo name change.
Adapted upstream's changes.
- `yarn.lock`:
Conflict because of an additional glitch-soc dependency.
Updated the dependencies upstream did.
2025-12-10 18:05:44 +01:00
Claire
7b8a5d42f1
Remove unused time series details from 2025 annual report ( #37187 )
2025-12-10 11:02:24 +00:00
Claire
2f6cdd6d47
Merge commit '1ae3b4672bffbc4aaf26f60c7063d6901239de5d' into glitch-soc/merge-upstream
2025-12-05 20:00:40 +01:00
Claire
9b851616fe
Remove more unused data from 2025 annual reports ( #37134 )
2025-12-05 13:36:37 +00:00
Claire
c8f365fd1d
Merge commit '0dac31dfd588e4cd866f382ed001a9535f06234a' into glitch-soc/merge-upstream
2025-12-04 20:59:54 +01:00
Claire
88aed3c11a
Fix streamed quoted polls not being hydrated correctly ( #37118 )
2025-12-04 14:10:48 +00:00
Claire
99ff59b7b2
Merge commit '37ccffa95a30772b55e3f18d486d699ee6c5f9e8' into glitch-soc/merge-upstream
2025-11-30 17:47:27 +01:00
Claire
945ef5a8e1
Remove unused data from 2025 annual reports ( #37033 )
2025-11-28 08:58:34 +00:00
Eashwar Ranganathan
826e9d7047
Make tootctl aware of 'require approval' for email domains ( #34579 )
2025-11-27 15:52:59 +00:00
Claire
7a56972381
Merge commit '366856f3bcdc2ff008b04e493a5de317ab83d5d0' into glitch-soc/merge-upstream
2025-11-19 21:49:09 +01:00
Matt Jankowski
4f6a7e44d1
Update rubocop-rspec to version 3.8.0 ( #36853 )
2025-11-19 10:14:51 +00:00
Matt Jankowski
53703202fb
Add IpBlock#to_cidr method to build string ( #35773 )
2025-11-17 14:51:05 +00:00
Claire
9525134c28
Merge commit '7e7f63a2efc83edd7c59a12e55eaab9509a4c15b' into glitch-soc/merge-upstream
2025-11-12 18:11:41 +01:00
Claire
ed3710e58f
Fix Update importing old previously-unknown activities and treating them as recent ones ( #36848 )
2025-11-12 16:09:00 +00:00
Claire
6ff4dad89d
Merge commit '055f581ca58b62132c1eff23453031d9df9dbf0e' into glitch-soc/merge-upstream
2025-10-31 18:03:21 +01:00
Claire
762e87b121
Fix SMTP configuration with mail 2.9.0 ( #36646 )
2025-10-30 11:21:32 +00:00
Claire
48ec31bec8
Merge commit '4896d2c4c6d3bd6b878c5a075b6611c65d4203b2' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
Upstream changed stuff too close to glitch-soc's theming system changes.
Applied upstream's changes.
- `streaming/index.js`:
Upstream refactored a bunch of stuff where our code was different due to
local-only posts.
Applied upstream's changes while taking care of local-only posts.
2025-10-28 22:10:12 +01:00
Claire
8fb524e07f
Add support for Update of converted object types ( #36322 )
2025-10-28 14:05:14 +00:00
Eugen Rochko
76053fb4a9
Fix hashtags not being picked up when full-width hash sign is used ( #36103 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com >
2025-10-27 17:18:01 +00:00
Claire
5674100f0b
Merge commit '118ff13bd028cfb19370a12edb9307ea96007ad7' into glitch-soc/merge-upstream
2025-10-21 15:57:43 +02:00
Claire
405a49df44
Merge commit from fork
...
* Refuse granting quote authorization for reblogs
* Add validation to reject quotes of reblogs
* Do not process quotes of reblogs as potentially valid quotes
* Refuse to serve quoted reblogs over REST API
2025-10-21 15:00:28 +02:00
Claire
ef413ef713
Merge commit '5a8ab0a3e62a8825e28bb74c1760ba6488d20c97' into glitch-soc/merge-upstream
2025-10-15 16:35:37 +02:00
Claire
264d068d8d
Change new accounts to use new ActivityPub numeric ID scheme ( #36365 )
2025-10-14 16:36:55 +00:00
Claire
af82db5271
Merge commit 'edd7fd98722a0d49ea486aa790a186735e491f35' into glitch-soc/merge-upstream
2025-10-13 18:07:08 +02:00
Eugen Rochko
33f739da44
Fix permalink redirects continuing to work for suspended accounts ( #36453 )
2025-10-13 15:18:01 +00:00
Claire
8921494571
Merge commit '7e98fa9b476fdaed235519f1d527eb956004ba0c' into glitch-soc/merge-upstream
2025-10-13 14:26:11 +02:00
Emelia Smith
24dcb18013
Merge commit from fork
...
* Ensure tootctl revokes sessions, access tokens and web push subscriptions
* Fix test coverage
2025-10-13 14:20:23 +02:00
Claire
490c89a5a9
Merge commit 'c858fc77ef194be0217fd98eae84efd261dba798' into glitch-soc/merge-upstream
2025-10-09 17:59:13 +02:00
Claire
d4a4a7177a
Fix crash when serializing quotes of deleted posts for ActivityPub ( #36381 )
2025-10-09 13:52:38 +00:00
Claire
f800057008
Merge commit 'b8444d9bb7885d75112a3cae74b6a5c711c7d547' into glitch-soc/merge-upstream
2025-10-08 18:07:04 +02:00
Claire
0be0a8898a
Fix Update/Delete of quoted status not being forwarded to quoters's followers ( #36390 )
2025-10-08 12:56:32 +00:00
Claire
b6c53c1129
Merge commit '150f0fcba5585782e2cac49d971904f02d5e6fbd' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/follower_accounts_controller.rb`:
Upstream refactored a part of the code where glitch-soc has changed the code
to potentially hide followers count.
Adapt upstream's changes.
2025-09-29 18:41:46 +02:00
Claire
150f0fcba5
Add support for numeric-based URIs for local accounts ( #32724 )
2025-09-29 12:05:48 +00:00
Claire
106b0a9d93
Merge commit 'a44a3f6d4047568921469ff9fbd212f553b1e7f4' into glitch-soc/merge-upstream
2025-09-27 21:46:57 +02:00
