Merge tag 'v3.1.5' into instance_only_statuses

2020-07-15 20:13:00 +02:00
parent e0f3a4583c 661f3f26b0
commit 06b6353483
1203 changed files with 15637 additions and 7055 deletions
--- a/app/views/settings/preferences/other/show.html.haml
+++ b/app/views/settings/preferences/other/show.html.haml
@ -1,7 +1,10 @@
 - content_for :page_title do
  = t('settings.preferences')

-= simple_form_for current_user, url: settings_preferences_other_path, html: { method: :put } do |f|
+- content_for :heading_actions do
+  = button_tag t('generic.save_changes'), class: 'button', form: 'edit_preferences'
+
+= simple_form_for current_user, url: settings_preferences_other_path, html: { method: :put, id: 'edit_preferences' } do |f|
  = render 'shared/error_messages', object: current_user

  .fields-group