diff options
| author | ThibG <thib@sitedethib.com> | 2019-06-07 22:15:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-07 22:15:44 +0200 |
| commit | 11c28abcfebcf8827f99a86540076347f1a1edff (patch) | |
| tree | b5d615001967cf102e88fac86b8ddb3227600109 /app/views/admin/pending_accounts/_account.html.haml | |
| parent | 83600198961cce9bfe82cf0f0c33286703bc86d1 (diff) | |
| parent | aec3fa35fda50e7f618dcf8b8f14e78a995583f4 (diff) | |
Merge pull request #1097 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views/admin/pending_accounts/_account.html.haml')
| -rw-r--r-- | app/views/admin/pending_accounts/_account.html.haml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/views/admin/pending_accounts/_account.html.haml b/app/views/admin/pending_accounts/_account.html.haml index 1ed5dafdd..7a9796a67 100644 --- a/app/views/admin/pending_accounts/_account.html.haml +++ b/app/views/admin/pending_accounts/_account.html.haml @@ -8,6 +8,8 @@ = "(@#{account.username})" %br/ = account.user_current_sign_in_ip + • + = t 'admin.accounts.time_in_queue', time: time_ago_in_words(account.user&.created_at) - if account.user&.invite_request&.text&.present? .pending-account__body |