about summary refs log tree commit diff
path: root/app/views
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2019-06-07 17:00:36 +0200
committerThibaut Girka <thib@sitedethib.com>2019-06-07 17:00:36 +0200
commit34b8346e7f1274d40734f9da3100a4343cf9f81c (patch)
tree1a851db65a949df937de0a3eb4fce1e9f83e5301 /app/views
parent83600198961cce9bfe82cf0f0c33286703bc86d1 (diff)
parenta60364ca7d26c82c9353980d0966d37e9aa66014 (diff)
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/statuses_controller.rb
- app/controllers/stream_entries_controller.rb
Diffstat (limited to 'app/views')
-rw-r--r--app/views/admin/pending_accounts/_account.html.haml2
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