Merge tag 'v3.0.0' into glitch-soc/merge-upstream

2019-10-04 19:49:43 +02:00
parent 360234d1bf 83d3e7733d
commit 1bbba0016a
31 changed files with 419 additions and 81 deletions
--- a/app/views/invites/_form.html.haml
+++ b/app/views/invites/_form.html.haml
@ -10,8 +10,5 @@
  .fields-group
    = f.input :autofollow, wrapper: :with_label

-  .fields-group
-    = f.input :comment, wrapper: :with_label, input_html: { maxlength: 420 }
-
  .actions
    = f.button :button, t('invites.generate'), type: :submit
--- a/app/views/invites/_invite.html.haml
+++ b/app/views/invites/_invite.html.haml
@ -20,9 +20,6 @@
    %td{ colspan: 2 }
      = t('invites.expired')

-  %td
-    = invite.comment
-
  %td
    - if invite.valid_for_use? && policy(invite).destroy?
      = table_link_to 'times', t('invites.delete'), invite_path(invite), method: :delete
--- a/app/views/invites/index.html.haml
+++ b/app/views/invites/index.html.haml
@ -15,7 +15,6 @@
        %th
        %th= t('invites.table.uses')
        %th= t('invites.table.expires_at')
-        %th= t('invites.table.comment')
        %th
    %tbody
      = render @invites