gitea/nas
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 17

Merge remote-tracking branch 'parent/main' into upstream-20240128

Browse source
This commit is contained in:
KMY 2025-01-31 08:52:03 +09:00
commit bd5b417d2b
107 changed files with 795 additions and 246 deletions
Download patch file Download diff file Expand all files Collapse all files

2
spec/requests/api/v2/instance_spec.rb
View file

@ -59,7 +59,7 @@ RSpec.describe 'Instances' do
description_limit: MediaAttachment::MAX_DESCRIPTION_LENGTH
),
polls: include(
max_options: PollValidator::MAX_OPTIONS
max_options: PollOptionsValidator::MAX_OPTIONS
)
)
)

4
spec/requests/api/v2/notifications_spec.rb
View file

@ -153,7 +153,7 @@ RSpec.describe 'Notifications' do
it 'returns a notification group covering all notifications' do
subject
notification_ids = user.account.notifications.reload.pluck(:id)
notification_ids = user.account.notifications.order(id: :asc).pluck(:id)
expect(response).to have_http_status(200)
expect(response.content_type)
@ -175,7 +175,7 @@ RSpec.describe 'Notifications' do
it 'returns a notification group covering all notifications' do
subject
notification_ids = user.account.notifications.reload.pluck(:id)
notification_ids = user.account.notifications.order(id: :asc).pluck(:id)
expect(response).to have_http_status(200)
expect(response.content_type)