gnh1201/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-09-05 17:31:12 +00:00
Code Issues Actions 34 Packages Projects Releases Wiki Activity

Merge 6a8e67038e into 14cb5ff881

Browse Source
This commit is contained in:
Matt Jankowski 2025-09-03 20:07:44 +00:00 committed by GitHub
commit 0a8195ce5f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/form/admin_settings.rb
View File

@ -142,6 +142,10 @@ class Form::AdminSettings
end end
end end
def persisted?
true
end
private private
def cache_digest_value(key) def cache_digest_value(key)

2
app/views/admin/settings/about/show.html.haml
View File

@ -5,7 +5,7 @@
%h2= t('admin.settings.title') %h2= t('admin.settings.title')
= render partial: 'admin/settings/shared/links' = render partial: 'admin/settings/shared/links'
= simple_form_for @admin_settings, url: admin_settings_about_path, html: { method: :patch } do |f| = simple_form_for @admin_settings, url: admin_settings_about_path do |f|
= render 'shared/error_messages', object: @admin_settings = render 'shared/error_messages', object: @admin_settings
%p.lead= t('admin.settings.about.preamble') %p.lead= t('admin.settings.about.preamble')

2
app/views/admin/settings/appearance/show.html.haml
View File

@ -5,7 +5,7 @@
%h2= t('admin.settings.title') %h2= t('admin.settings.title')
= render partial: 'admin/settings/shared/links' = render partial: 'admin/settings/shared/links'
= simple_form_for @admin_settings, url: admin_settings_appearance_path, html: { method: :patch } do |f| = simple_form_for @admin_settings, url: admin_settings_appearance_path do |f|
= render 'shared/error_messages', object: @admin_settings = render 'shared/error_messages', object: @admin_settings
%p.lead= t('admin.settings.appearance.preamble') %p.lead= t('admin.settings.appearance.preamble')

2
app/views/admin/settings/branding/show.html.haml
View File

@ -5,7 +5,7 @@
%h2= t('admin.settings.title') %h2= t('admin.settings.title')
= render partial: 'admin/settings/shared/links' = render partial: 'admin/settings/shared/links'
= simple_form_for @admin_settings, url: admin_settings_branding_path, html: { method: :patch } do |f| = simple_form_for @admin_settings, url: admin_settings_branding_path do |f|
= render 'shared/error_messages', object: @admin_settings = render 'shared/error_messages', object: @admin_settings
%p.lead= t('admin.settings.branding.preamble') %p.lead= t('admin.settings.branding.preamble')

2
app/views/admin/settings/content_retention/show.html.haml
View File

@ -5,7 +5,7 @@
%h2= t('admin.settings.title') %h2= t('admin.settings.title')
= render partial: 'admin/settings/shared/links' = render partial: 'admin/settings/shared/links'
= simple_form_for @admin_settings, url: admin_settings_content_retention_path, html: { method: :patch } do |f| = simple_form_for @admin_settings, url: admin_settings_content_retention_path do |f|
= render 'shared/error_messages', object: @admin_settings = render 'shared/error_messages', object: @admin_settings
%p.lead= t('admin.settings.content_retention.preamble') %p.lead= t('admin.settings.content_retention.preamble')

2
app/views/admin/settings/discovery/show.html.haml
View File

@ -5,7 +5,7 @@
%h2= t('admin.settings.title') %h2= t('admin.settings.title')
= render partial: 'admin/settings/shared/links' = render partial: 'admin/settings/shared/links'
= simple_form_for @admin_settings, url: admin_settings_discovery_path, html: { method: :patch } do |f| = simple_form_for @admin_settings, url: admin_settings_discovery_path do |f|
= render 'shared/error_messages', object: @admin_settings = render 'shared/error_messages', object: @admin_settings
%p.lead= t('admin.settings.discovery.preamble') %p.lead= t('admin.settings.discovery.preamble')

2
app/views/admin/settings/registrations/show.html.haml
View File

@ -5,7 +5,7 @@
%h2= t('admin.settings.title') %h2= t('admin.settings.title')
= render partial: 'admin/settings/shared/links' = render partial: 'admin/settings/shared/links'
= simple_form_for @admin_settings, url: admin_settings_registrations_path, html: { method: :patch } do |f| = simple_form_for @admin_settings, url: admin_settings_registrations_path do |f|
= render 'shared/error_messages', object: @admin_settings = render 'shared/error_messages', object: @admin_settings
%p.lead= t('admin.settings.registrations.preamble') %p.lead= t('admin.settings.registrations.preamble')

4
spec/models/form/admin_settings_spec.rb
View File

@ -53,4 +53,8 @@ RSpec.describe Form::AdminSettings do
end end
end end
end end
describe '#persisted?' do
it { is_expected.to be_persisted }
end
end end