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

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

Browse source
This commit is contained in:
KMY 2025-03-28 08:44:30 +09:00
commit 12ed20b6d5
257 changed files with 3505 additions and 2010 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/serializers/rest/instance_serializer.rb
View file

@ -131,7 +131,9 @@ class REST::InstanceSerializer < ActiveModel::Serializer
enabled: registrations_enabled?,
approval_required: Setting.registrations_mode == 'approved' || (Setting.registrations_mode == 'open' && !registrations_in_time?),
limit_reached: Setting.registrations_mode != 'none' && reach_registrations_limit?,
reason_required: Setting.registrations_mode == 'approved' && Setting.require_invite_text,
message: registrations_enabled? ? nil : registrations_message,
min_age: Setting.min_age.presence,
url: ENV.fetch('SSO_ACCOUNT_SIGN_UP', nil),
}
end

2
app/serializers/rest/terms_of_service_serializer.rb
View file

@ -4,7 +4,7 @@ class REST::TermsOfServiceSerializer < ActiveModel::Serializer
attributes :effective_date, :effective, :content, :succeeded_by
def effective_date
object.effective_date.iso8601
(object.effective_date || object.published_at).iso8601
end
def effective