diff options
| author | ThibG <thib@sitedethib.com> | 2018-10-24 11:28:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-24 11:28:25 +0200 |
| commit | 0e8de56a22aee089da8aa1c64bab941bc5911e5d (patch) | |
| tree | ac3f4100e27a9341c32c15e07661af841c547ec0 /app/views/settings/preferences | |
| parent | 4739e0f090a04235669ef81fa432ae90bb62f4c4 (diff) | |
| parent | ed8d06212f439b9fe2f170a6f43d6be6d586ff80 (diff) | |
Merge pull request #792 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views/settings/preferences')
| -rw-r--r-- | app/views/settings/preferences/show.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/settings/preferences/show.html.haml b/app/views/settings/preferences/show.html.haml index 751a6e50b..45f9fd178 100644 --- a/app/views/settings/preferences/show.html.haml +++ b/app/views/settings/preferences/show.html.haml @@ -22,7 +22,7 @@ %hr#settings_publishing/ .fields-group - = f.input :setting_default_privacy, collection: Status.visibilities.keys - ['direct'], wrapper: :with_floating_label, include_blank: false, label_method: lambda { |visibility| safe_join([I18n.t("statuses.visibilities.#{visibility}"), content_tag(:span, I18n.t("statuses.visibilities.#{visibility}_long"), class: 'hint')]) }, required: false, as: :radio_buttons, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li' + = f.input :setting_default_privacy, collection: Status.selectable_visibilities, wrapper: :with_floating_label, include_blank: false, label_method: lambda { |visibility| safe_join([I18n.t("statuses.visibilities.#{visibility}"), content_tag(:span, I18n.t("statuses.visibilities.#{visibility}_long"), class: 'hint')]) }, required: false, as: :radio_buttons, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li' = f.input :setting_default_sensitive, as: :boolean, wrapper: :with_label |