Merge branch '33819-authorby' into 'master'

correct ByAuthor translation in commit box Closes #33819 See merge request !12256

Merge branch '33819-authorby' into 'master'
ee6fbed7 · Douwe Maan · Clement Ho · 22874c64 · ee6fbed7
Commit ee6fbed7 authored Jun 19, 2017 by Douwe Maan Committed by Clement Ho Jun 19, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

_commit_box.html.haml app/views/projects/commit/_commit_box.html.haml +1 -1

No files found.
--- 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)