diff options
| author | ThibG <thib@sitedethib.com> | 2019-10-05 18:04:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-05 18:04:36 +0200 |
| commit | 3921125e5578fb3871fdcae0e8e8a77179f1ad72 (patch) | |
| tree | 997c8ed2e7a6b8152266edc0c37ea8264c59d1ab /app/views/invites | |
| parent | 857c67f31b23b9c496e07eda41755ba449a37f17 (diff) | |
| parent | bc8543d9af0045fe2175f7e2234da9c77dc55023 (diff) | |
Merge pull request #1228 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views/invites')
| -rw-r--r-- | app/views/invites/_form.html.haml | 3 | ||||
| -rw-r--r-- | app/views/invites/_invite.html.haml | 3 | ||||
| -rw-r--r-- | app/views/invites/index.html.haml | 1 |
3 files changed, 0 insertions, 7 deletions
diff --git a/app/views/invites/_form.html.haml b/app/views/invites/_form.html.haml index b19f70539..3a2a5ef0e 100644 --- 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 diff --git a/app/views/invites/_invite.html.haml b/app/views/invites/_invite.html.haml index 03050c868..62799ca5b 100644 --- a/app/views/invites/_invite.html.haml +++ b/app/views/invites/_invite.html.haml @@ -21,8 +21,5 @@ = 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 diff --git a/app/views/invites/index.html.haml b/app/views/invites/index.html.haml index 62065d6ae..61420ab1e 100644 --- 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 |