diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-06-19 17:08:05 +0300 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2017-06-19 17:23:11 +0300 |
| commit | ee6fbed71c1ede838227a0f7165bb5a6fb6650db (patch) | |
| tree | 93245678d5cf82055efc97b0870aa8feb5df26e4 /app/views | |
| parent | 22874c647605cbb33f9ff7ffefffa479d02ab75e (diff) | |
Merge branch '33819-authorby' into 'master'
correct ByAuthor translation in commit box
Closes #33819
See merge request !12256
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/commit/_commit_box.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/commit/_commit_box.html.haml b/app/views/projects/commit/_commit_box.html.haml index df97b4d9c13..7fe44816bae 100644 --- a/app/views/projects/commit/_commit_box.html.haml +++ b/app/views/projects/commit/_commit_box.html.haml @@ -6,7 +6,7 @@ = clipboard_button(text: @commit.id, title: _("Copy commit SHA to clipboard")) %span.hidden-xs authored #{time_ago_with_tooltip(@commit.authored_date)} - %span= _('ByAuthor|by') + %span= s_('ByAuthor|by') = author_avatar(@commit, size: 24) %strong = commit_author_link(@commit, avatar: true, size: 24) |