Nicholas La Roux
438602c488
Upgrade rubocop from v1.84.0 to v1.84.2, update config, and correct offences ( #37795 )
2026-02-17 14:56:46 +00:00
Claire
f47e2937cf
Merge commit '0b66e744263a4af1f14d03886ea2a9da4ca156db' into glitch-soc/merge-upstream
2026-02-17 12:11:33 +01:00
Claire
0b66e74426
Add GET /api/v1/donation_campaigns ( #37880 )
2026-02-17 10:54:21 +00:00
Claire
ddc7df2064
Merge commit '6c3bd944f8890e1a349bd06e9585cb5ec25507e6' into glitch-soc/merge-upstream
2026-02-13 13:03:51 +01:00
David Roetzel
6c3bd944f8
Allow reporting (local) Collections ( #37848 )
2026-02-13 11:11:44 +00:00
Claire
e451416d90
Merge commit 'c44cc1f5c3bafb49a324f8f72a42a91d09eecfe3' into glitch-soc/merge-upstream
2026-02-12 18:00:45 +01:00
David Roetzel
f57167c61a
Add ID/URI to collection items ( #37842 )
2026-02-12 15:31:45 +00:00
Claire
59e02a628d
Merge commit 'f652c54c3334890176331f62150559a96eeb41ae' into glitch-soc/merge-upstream
...
Conflicts:
- `app/services/backup_service.rb`:
Upstream refactored activity serialization while glitch-soc passed an extra argument.
Followed upstream's refactor, keeping our extra argument.
2026-02-05 12:43:12 +01:00
Matt Jankowski
e82eb2b037
Convert admin/confirmations spec controller->request/system ( #37738 )
2026-02-05 10:04:10 +00:00
Claire
3bbc8ecf92
Merge commit '8ebe2e673e2fd175140df7275eb362c8eecfec31' into glitch-soc/merge-upstream
2026-02-04 19:23:24 +01:00
Claire
33dc4a6091
Merge commit '4f99b48e8e8c9818f85be1b2ac9abad75f538585' into glitch-soc/merge-upstream
2026-02-04 18:51:17 +01:00
Matt Jankowski
0d6fc8026d
Convert auth/confirmations spec controller->request ( #37735 )
2026-02-04 17:42:50 +00:00
Matt Jankowski
4f99b48e8e
Convert admin/accounts controller->request specs ( #37727 )
2026-02-04 10:42:34 +00:00
Claire
5b926157e8
Merge commit '6188de3efc293a6327cabcb858430aa79564dfd7' into glitch-soc/merge-upstream
2026-02-02 18:26:04 +01:00
Matt Jankowski
9de54635ed
Add coverage for "too many IDs" scenario in api/v1/statuses ( #37699 )
2026-02-02 15:11:15 +00:00
Claire
b14cbb3ee9
Merge pull request #3364 from ClearlyClaire/glitch-soc/features/local-only-drop-emoji
...
Deprecate eye emoji in favor of a bespoke API parameter
2026-01-27 22:30:17 +01:00
Claire
5a45a3203a
Merge commit '7af5ba271d6f04831f000e9b815914375e42abeb' into glitch-soc/merge-upstream
2026-01-27 18:03:27 +01:00
Matt Jankowski
aa347708f5
Convert oauth/authorized_applications spec controller->request ( #37614 )
2026-01-27 10:44:24 +00:00
Matt Jankowski
604bed2930
Convert oauth/authorizations spec controller->request ( #37613 )
2026-01-27 10:20:25 +00:00
Claire
8b95254883
Merge commit 'c36db57acedf0033c090748125c665a0360cd11f' into glitch-soc/merge-upstream
2026-01-23 17:57:20 +01:00
David Roetzel
c5c70311d8
Return empty array when requesting collections of an account that blocked you ( #37591 )
2026-01-23 13:11:57 +00:00
David Roetzel
de63b61943
Change Collections API shape ( #37580 )
2026-01-23 10:22:37 +00:00
Matt Jankowski
157d8c0d99
Remove deprecated usage of imagemagick ( #37488 )
2026-01-22 14:57:19 +00:00
Matt Jankowski
7b9479239a
Typo fix in federation document ( #37564 )
2026-01-22 13:59:36 +00:00
Claire
95aaefe083
Merge commit '562ea656f495f0619e393b7d93bd07c5abd28e5a' into glitch-soc/merge-upstream
2026-01-21 22:04:02 +01:00
David Roetzel
783504f36a
Do not return undiscoverable collections ( #37560 )
2026-01-21 12:30:07 +00:00
Claire
5d04c56c48
Merge commit '400c1f3e8ec0ffd33ad30d9334b9210cdb89b14c' into glitch-soc/merge-upstream
2026-01-20 16:14:14 +01:00
Claire
c2f776b747
Merge commit from fork
2026-01-20 15:10:38 +01:00
David Roetzel
7cdc05b9a8
Add language attribute to collections ( #37549 )
2026-01-20 13:22:54 +00:00
David Roetzel
51224bb437
Add "featured collections" collection to actors ( #37512 )
2026-01-20 08:27:05 +00:00
Claire
ba45eb8764
Merge commit 'bc2f8a358f96a9540e6f39bb1c58273deb4545de' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/layouts/application.html.haml`:
Upstream changed how theming works, and in particular changed the set of HTML attributes.
Adapted upstream's change.
2026-01-15 18:02:35 +01:00
diondiondion
bc2f8a358f
Enable theming via new HTML element attributes ( #37477 )
2026-01-15 16:04:27 +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
b4ed1e6c99
Merge commit '19bc3e76ea1d7fa2d9af711613a77fc0f5f0d1b5' into glitch-soc/main
...
Conflicts:
- `app/helpers/theme_helper.rb`:
Upstream added a helper to insert javascript tags, close to where we had
modified code.
Ported upstream's change.
2026-01-13 18:30:48 +01:00
Matt Jankowski
19bc3e76ea
Add spec for quote policy update change ( #37474 )
2026-01-13 16:21:55 +00:00
Claire
5b54cd7f76
Add ability to include inline javascript ( #37459 )
2026-01-13 10:40:26 +00:00
Claire
aa6ec435d2
Merge commit '9fe14a30724e18425aedaba59ca63c63d8b14083' into glitch-soc/merge-upstream
2026-01-07 14:53:51 +01:00
Claire
0f79e29188
Merge commit from fork
2026-01-07 14:15:14 +01:00
Claire
b1d219afd0
Merge commit '82fb2596c70a18fc4a2d99ab51106180196bfe98' into glitch-soc/merge-upstream
2026-01-05 18:19:58 +01:00
Claire
82fb2596c7
Fix posts with edited out media attachments being returned in /api/v1/accounts/:id/statuses?only_media=true ( #37363 )
2026-01-05 15:06:20 +00:00
Claire
b5bc301cbd
Fix serialization of context pages ( #37376 )
2026-01-05 11:59:10 +00:00
Claire
f711e222dc
Fix quotes with CWs but no text not having fallback link ( #37361 )
2026-01-05 10:35:35 +00:00
Claire
2ebf6d60a6
Merge commit 'e89acc2302df49cbd7815b031e9c2939632bd204' into glitch-soc/merge-upstream
...
Conflicts:
- `yarn.lock`:
Conflict because of an extra dependency in glitch-soc.
Updated upstream's dependencies as upstream did.
2026-01-03 16:05:35 +01:00
Claire
bc3f68b46a
Fix date-related wrapstodon test failures ( #37362 )
2026-01-02 10:52:22 +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
db62d70492
Change Wrapstodon switch from feature flag to admin setting ( #37273 )
2025-12-17 09:47:02 +00:00
Claire
780fefa700
Merge commit '53be8392eceea8c3a576478e209fe82c2ceb458a' into glitch-soc/merge-upstream
2025-12-16 18:27:03 +01:00
Matt Jankowski
dbf8d77cbb
Add spec for missing username value in create account API ( #37057 )
2025-12-16 15:43:04 +00:00
