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-20240604

Browse source
This commit is contained in:
KMY 2024-06-04 08:02:05 +09:00
commit 8927b1444b
89 changed files with 1132 additions and 458 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/views/auth/registrations/edit.html.haml
View file

@ -3,7 +3,7 @@
- if self_destruct?
.flash-message.warning
= t('auth.status.self_destruct', domain: ENV.fetch('LOCAL_DOMAIN'))
= t('auth.status.self_destruct', domain: Rails.configuration.x.local_domain)
- else
= render partial: 'status', locals: { user: @user, strikes: @strikes }

2
app/views/errors/self_destruct.html.haml
View file

@ -3,7 +3,7 @@
.simple_form
%h1.title= t('self_destruct.title')
%p.lead= t('self_destruct.lead_html', domain: ENV.fetch('LOCAL_DOMAIN'))
%p.lead= t('self_destruct.lead_html', domain: Rails.configuration.x.local_domain)
.form-footer
%ul.no-list