Commit 43d0e16
committed
Update upstream to mastodon/mastodon@b846f88
1 parent 027de88 commit 43d0e16
1 file changed
+1
-1
lines changed- app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb+1-1
- app/javascript/mastodon/components/form_fields/combobox.module.scss+12
- app/javascript/mastodon/components/form_fields/combobox_field.stories.tsx+61-43
- app/javascript/mastodon/components/form_fields/combobox_field.tsx+150-73
- app/javascript/mastodon/features/collections/editor/accounts.tsx+16-23
- app/models/collection.rb+1
- app/models/collection_item.rb+1
- app/serializers/rest/collection_item_serializer.rb+5-3
- app/serializers/rest/collection_serializer.rb+5-1
- spec/models/collection_spec.rb+20-5
- spec/serializers/rest/collection_item_serializer_spec.rb+17-7
- spec/serializers/rest/collection_serializer_spec.rb+26
0 commit comments