tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
- `app/views/layouts/mailer.html.haml`:
  Upstream removed a line close to one modified by glitch-soc.
  Removed the line as upstream did.
This commit is contained in:
Claire
2023-01-14 22:34:09 +01:00
parent afd0d424da d66dfc7b3c
commit ab59743c13
13 changed files with 211 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,6 +29,16 @@
.fields-group
= f.input :noindex, as: :boolean, wrapper: :with_label, label: t('admin.settings.default_noindex.title'), hint: t('admin.settings.default_noindex.desc_html')
%h4= t('admin.settings.discovery.publish_statistics')
.fields-group
= f.input :activity_api_enabled, as: :boolean, wrapper: :with_label, recommended: :recommended
%h4= t('admin.settings.discovery.publish_discovered_servers')
.fields-group
= f.input :peers_api_enabled, as: :boolean, wrapper: :with_label, recommended: :recommended
%h4= t('admin.settings.discovery.follow_recommendations')
.fields-group