Claire
47b0e7897c
Merge commit 'd3cef824018a79ba383deab85e09c31d2673d2c3' into glitch-soc/merge-upstream
2026-02-09 13:11:17 +01:00
Claire
d3cef82401
Refactor store_current_location before_action in OAuth::AuthorizationsController ( #37779 )
2026-02-09 11:05:32 +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
f652c54c33
Update devise to version 5.0 ( #37419 )
2026-02-05 11:05:32 +00:00
David Roetzel
9cd94168b3
Federate Remove when collection is deleted ( #37741 )
2026-02-05 10:33:39 +00:00
David Roetzel
73206856c5
Refactor activity serialization ( #37678 )
2026-02-05 09:39:27 +00:00
Claire
13499168f8
Merge commit 'c48634cf5f3c5b50fcf6ea075121fa2d88e07c0e' into glitch-soc/merge-upstream
2026-02-03 15:44:04 +01:00
Claire
629125cc3d
Merge commit from fork
2026-02-03 14:59:53 +01:00
Claire
32993fbdef
Merge commit 'a6883242e3d9f9ed85806b66d40e1a148972bc3c' into glitch-soc/merge-upstream
2026-01-28 19:54:41 +01:00
Claire
36be9bbebf
Merge commit 'a495a0cbfcf9f6111c0e598af0864de2b76e4111' into glitch-soc/merge-upstream
2026-01-28 19:29:10 +01:00
Claire
2e0caa2b73
Merge commit '1ae6b52c471d82d3682a732680549fd849c91957' into glitch-soc/merge-upstream
2026-01-28 19:05:27 +01:00
Matt Jankowski
14ca5d0e6b
Use collection partial for rule translation in signup flow ( #35932 )
2026-01-28 14:05:02 +00:00
Matt Jankowski
f861a5cee0
Add action_logs association for account ( #36022 )
2026-01-28 11:04:00 +00:00
Matt Jankowski
c1626486bc
Group classes in media proxy rescue_from declaration ( #37304 )
2026-01-28 10:52:31 +00:00
Matt Jankowski
1ae6b52c47
Reduce oauth/authorizations monkey-patch size ( #37615 )
2026-01-28 09:29:59 +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
b96c8ecff4
Merge commit '89c1b9a8fdfe38881ad1b6c22f20240b087aa993' into glitch-soc/merge-upstream
2026-01-26 18:09:54 +01:00
Claire
8b95254883
Merge commit 'c36db57acedf0033c090748125c665a0360cd11f' into glitch-soc/merge-upstream
2026-01-23 17:57:20 +01:00
Matt Jankowski
29ec2cd186
Add targeted_account_notes association to simplify usage ( #35540 )
2026-01-23 16:35:19 +00: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
Claire
958103368e
Shorten caching of quote posts pending approval ( #37570 )
2026-01-22 12:38:00 +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
028e76f770
Merge commit from fork
...
* Add limit on inbox payload size
The 1MB limit is consistent with the limit we use when fetching remote resources
* Add limit to number of options from federated polls
* Add a limit to the number of federated profile fields
* Add limit on federated username length
* Add hard limits for federated display name and account bio
* Add hard limits for `alsoKnownAs` and `attributionDomains`
* Add hard limit on federated custom emoji shortcode
* Highlight most destructive limits and expand on their reasoning
2026-01-20 15:14:45 +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
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
e33a8d5bfb
Merge commit '9b5986b36e86d50d19b68b10788b3316012894c3' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/api/v1/statuses_controller.rb`:
Upstream refactored a bit where we had an extra argument for markdown/HTML.
Adapted upstream change.
2026-01-13 18:01:53 +01:00
Shlee
9b5986b36e
Fix quote_approval_policy being reset to user defaults when omitted in status update ( #37436 )
2026-01-13 10:40:08 +00:00
Claire
d7254ecec4
Merge commit 'a4b8b9fe98c677f718e4b2c1ffe1755d58e7f8d7' into glitch-soc/merge-upstream
2026-01-10 13:12:36 +01:00
Joshua Rogers
b55982cc1a
Fix Vary parsing in cache control enforcement ( #37426 )
2026-01-09 16:21:18 +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
b5bc301cbd
Fix serialization of context pages ( #37376 )
2026-01-05 11:59:10 +00:00
Claire
c7ad055ff3
Merge commit 'a0ce77673c977e3a90d0c7d1c2acd250b7fad0c2' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/application_controller.rb`:
Upstream added an experimental color and contrast theme control.
Conflicts because of glitch-soc's different theming system.
Adapted upstream's changes.
- `app/views/layouts/application.html.haml`:
Upstream added an experimental color and contrast theme control.
Conflicts because of glitch-soc's different theming system.
Adapted upstream's changes.
- `app/views/settings/preferences/appearance/show.html.haml`:
Upstream added an experimental color and contrast theme control.
Conflicts because of glitch-soc's different theming system.
Adapted upstream's changes.
2026-01-03 15:26:58 +01:00
diondiondion
a0ce77673c
Add dedicated user preferences for theme mode & contrast ( #37288 )
2025-12-19 15:31:44 +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
780fefa700
Merge commit '53be8392eceea8c3a576478e209fe82c2ceb458a' into glitch-soc/merge-upstream
2025-12-16 18:27:03 +01:00
Claire
550a6d4765
Add wrapstodon to initial state and show wrapstodon sidebar item on load ( #37261 )
2025-12-16 09:47:18 +00:00
Claire
1fdb48c668
Merge commit 'cbe135210305c0ce4455130c4e75680e53ff1425' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/wrapstodon/show.html.haml`:
Conflict caused by glitch-soc's theming system.
Updated upstream changes.
2025-12-15 20:22:20 +01:00
Nicholas La Roux
09ab2829da
Upgrade rubocop-rails from 2.33.4 to 2.34.2 and address related offenses ( #37243 )
2025-12-15 12:57:16 +00:00
Claire
dc4fb51e52
Increase cache duration on public shared wrapstodon page ( #37249 )
2025-12-15 10:19:17 +00:00
David Roetzel
bb72ecd466
Add simple API to remove item from collection ( #37225 )
2025-12-15 08:03:49 +00:00
David Roetzel
1766616ebc
Refactor relation preloading ( #37217 )
2025-12-15 07:35:46 +00:00
