Merge changes from upstream with the CSS reload fix

2017-07-18 18:58:47 +02:00
parent c727eae441 0b4006fc47
commit d69fa9e1f4
98 changed files with 1376 additions and 582 deletions
--- a/app/views/settings/preferences/show.html.haml
+++ b/app/views/settings/preferences/show.html.haml
@ -44,6 +44,7 @@
    = f.input :setting_noindex, as: :boolean, wrapper: :with_label

  .fields-group
+    = f.input :setting_unfollow_modal, as: :boolean, wrapper: :with_label
    = f.input :setting_boost_modal, as: :boolean, wrapper: :with_label
    = f.input :setting_delete_modal, as: :boolean, wrapper: :with_label