diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-06-19 14:08:05 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-06-19 14:08:05 +0000 |
| commit | c0c394262833a4a35e3b2f7006ba6a4e93ef80d1 (patch) | |
| tree | f9e9527bd5a70d382afbc6a712f9a233cb62e4c9 | |
| parent | b18c12ec6a9564d55bd2851a82ff2513b8485fe0 (diff) | |
| parent | 8cef4b5e21349cee862c3e2f03fb8997a12cd9df (diff) | |
| download | gitlab-ce-c0c394262833a4a35e3b2f7006ba6a4e93ef80d1.tar.gz | |
Merge branch '33819-authorby' into 'master'
correct ByAuthor translation in commit box
Closes #33819
See merge request !12256
| -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) |