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

Merge commit '1cb978bcc3d291a045f367e072ca0af1a1c4dbbc' into glitch-soc/merge-upstream

Browse Source
This commit is contained in:
Claire
2023-08-22 18:50:14 +02:00
parent 245fe855be 1cb978bcc3
commit 10404aece8
22 changed files with 237 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/settings/privacy/show.html.haml
View File

@@ -18,7 +18,7 @@
= f.input :discoverable, as: :boolean, wrapper: :with_label, recommended: true
.fields-group
= f.input :locked, as: :boolean, wrapper: :with_label
= f.input :unlocked, as: :boolean, wrapper: :with_label
%h4= t('privacy.search')
@@ -33,7 +33,7 @@
%p.lead= t('privacy.privacy_hint_html')
.fields-group
= f.input :hide_collections, as: :boolean, wrapper: :with_label
= f.input :show_collections, as: :boolean, wrapper: :with_label
= f.simple_fields_for :settings, current_user.settings do |ff|
.fields-group