Merge tag 'v3.1.2' into hometown-dev

2020-03-02 10:01:54 -08:00
parent 513f13e0c1 aa8568b7f2
commit 3f20f4a4ba
33 changed files with 571 additions and 394 deletions
--- a/app/views/auth/registrations/new.html.haml
+++ b/app/views/auth/registrations/new.html.haml
@ -27,7 +27,7 @@

  - if approved_registrations? && !@invite.present?
    .fields-group
-      = f.simple_fields_for :invite_request do |invite_request_fields|
+      = f.simple_fields_for :invite_request, resource.invite_request || resource.build_invite_request do |invite_request_fields|
        = invite_request_fields.input :text, as: :text, wrapper: :with_block_label, required: false

  = f.input :invite_code, as: :hidden