about summary refs log tree commit diff
path: root/app/views/settings/preferences
diff options
context:
space:
mode:
authorDavid Yip <yipdw@member.fsf.org>2018-05-18 07:53:04 -0500
committerDavid Yip <yipdw@member.fsf.org>2018-05-18 08:47:10 -0500
commite0eebba46192e5ef2050347069c4098d33e9ec54 (patch)
treee58d15f7bd6d5c5f5ce53d880a7ad89bf3faaab2 /app/views/settings/preferences
parent4c0770d6c8dac8177b8891a6fb97ccf440100fc2 (diff)
parent57b503d4ef0754e4651eae26b628cba60e1ab4e9 (diff)
Merge remote-tracking branch 'origin/master' into merge-upstream
  Conflicts:
 	app/controllers/follower_accounts_controller.rb
 	app/controllers/following_accounts_controller.rb
 	app/controllers/settings/preferences_controller.rb
 	app/lib/user_settings_decorator.rb
 	app/models/user.rb
 	config/locales/simple_form.en.yml
Diffstat (limited to 'app/views/settings/preferences')
-rw-r--r--app/views/settings/preferences/show.html.haml3
1 files changed, 3 insertions, 0 deletions
diff --git a/app/views/settings/preferences/show.html.haml b/app/views/settings/preferences/show.html.haml
index 102e4d200..4632034d7 100644
--- a/app/views/settings/preferences/show.html.haml
+++ b/app/views/settings/preferences/show.html.haml
@@ -26,6 +26,9 @@
   .fields-group
     = f.input :setting_noindex, as: :boolean, wrapper: :with_label
 
+  .fields-group
+    = f.input :setting_hide_network, as: :boolean, wrapper: :with_label
+
   %h4= t 'preferences.web'
 
   .fields-group