diff options
| author | ThibG <thib@sitedethib.com> | 2019-06-27 16:43:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-27 16:43:55 +0200 |
| commit | 2f95adc06fbfae22e8f9b4df212938108f5e295c (patch) | |
| tree | 13ff1b5ae743f3d147eb58dfa4a790ef1a7c049d /app/views | |
| parent | 9ef25877dfda12cf31ec586294e4d4908f5be4f0 (diff) | |
| parent | 6ab7051b48dcb1d45c377a129350db1fdeaf11b8 (diff) | |
Merge pull request #1142 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/settings/preferences/appearance/show.html.haml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/views/settings/preferences/appearance/show.html.haml b/app/views/settings/preferences/appearance/show.html.haml index 9577c10b5..1709c9c84 100644 --- a/app/views/settings/preferences/appearance/show.html.haml +++ b/app/views/settings/preferences/appearance/show.html.haml @@ -33,6 +33,9 @@ = f.input :setting_display_media, collection: ['default', 'show_all', 'hide_all'],label_method: lambda { |item| t("simple_form.hints.defaults.setting_display_media_#{item}") }, hint: false, as: :radio_buttons, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li', wrapper: :with_floating_label .fields-group + = f.input :setting_use_blurhash, as: :boolean, wrapper: :with_label + + .fields-group = f.input :setting_expand_spoilers, as: :boolean, wrapper: :with_label .actions |