Merge branch 'master' into glitch-soc/merge-upstream

2019-06-10 20:09:05 +02:00
parent fc6d27daf3 5bcd98172c
commit 7778de467c
2 changed files with 6 additions and 1 deletions
--- a/app/views/settings/preferences/other/show.html.haml
+++ b/app/views/settings/preferences/other/show.html.haml
@ -1,7 +1,7 @@
 - content_for :page_title do
  = t('settings.preferences')

-= simple_form_for current_user, url: settings_preferences_path, html: { method: :put } do |f|
+= simple_form_for current_user, url: settings_preferences_other_path, html: { method: :put } do |f|
  = render 'shared/error_messages', object: current_user

  .fields-group