summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Schatz <jschatz1@gmail.com>2016-03-21 19:50:14 +0000
committerRémy Coutable <remy@rymai.me>2016-03-22 12:33:42 +0100
commit067539807dcfa5939c19bfc45026ba447acfc1ee (patch)
treefd61f37469b294a584103a6605e665ca768cc468
parent6ecabcbe95b8e53a1b870a3fddfbafa62a1146b3 (diff)
downloadgitlab-ce-067539807dcfa5939c19bfc45026ba447acfc1ee.tar.gz
Merge branch 'ssh-page-ago' into 'master'
Remove duplicated ago Closes #14460 See merge request !3332
-rw-r--r--app/views/profiles/keys/_key.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/profiles/keys/_key.html.haml b/app/views/profiles/keys/_key.html.haml
index 25e9e8ff008..4dbaa662b66 100644
--- a/app/views/profiles/keys/_key.html.haml
+++ b/app/views/profiles/keys/_key.html.haml
@@ -8,7 +8,7 @@
= key.fingerprint
.pull-right
%span.key-created-at
- created #{time_ago_with_tooltip(key.created_at)} ago
+ created #{time_ago_with_tooltip(key.created_at)}
= link_to path_to_key(key, is_admin), data: { confirm: 'Are you sure?'}, method: :delete, class: "btn btn-transparent prepend-left-10" do
%span.sr-only Remove
= icon('trash')