Merge tag 'v3.2.0' into hometown-dev

2020-08-11 13:56:04 -07:00
parent 65dc8812c9 93dd413a47
commit 52cb64a183
676 changed files with 20549 additions and 6955 deletions
--- a/app/views/admin/reports/index.html.haml
+++ b/app/views/admin/reports/index.html.haml
@ -18,7 +18,7 @@
        = text_field_tag key, params[key], class: 'string optional', placeholder: I18n.t("admin.reports.#{key}")

    .actions
-      %button= t('admin.accounts.search')
+      %button.button= t('admin.accounts.search')
      = link_to t('admin.accounts.reset'), admin_reports_path, class: 'button negative'

 - @reports.group_by(&:target_account_id).each do |target_account_id, reports|