diff options
| author | Jacob Schatz <jschatz1@gmail.com> | 2016-03-21 19:50:14 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz1@gmail.com> | 2016-03-21 19:50:14 +0000 |
| commit | 355d3119fdeb29d2d5a9764364e1e864c05f79c1 (patch) | |
| tree | af9f19b7fb007ff5a26bb13ff508dc9fb2111443 /app | |
| parent | 16b44f718429ff8671c097ea2898046714054eda (diff) | |
| parent | f9b942259c8b21a7e2838ac48d4734fa6eda80df (diff) | |
| download | gitlab-ce-355d3119fdeb29d2d5a9764364e1e864c05f79c1.tar.gz | |
Merge branch 'ssh-page-ago' into 'master'
Remove duplicated ago
Closes #14460
See merge request !3332
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/profiles/keys/_key.html.haml | 2 |
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') |