diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-06-16 16:16:35 +0000 |
|---|---|---|
| committer | Ruben Davila <rdavila84@gmail.com> | 2017-06-16 19:00:27 -0500 |
| commit | 2a7deae183a73c24bea135d75956918815a655fb (patch) | |
| tree | facc4ee1fb1b0538b77837eddcea66ac391b8434 /app/views/projects/commits/_commit.html.haml | |
| parent | 999926075d82552f630d4e9d8b1128f5f2e131af (diff) | |
| download | gitlab-ce-9-3-stable-rc3-i18n.tar.gz | |
Merge branch 'bvl-missing-translations' into 'master'9-3-stable-rc3-i18n
Missing translations for the project & repository pages.
Closes #33420
See merge request !12052
Conflicts:
app/assets/javascripts/locale/en/app.js
app/assets/javascripts/locale/es/app.js
app/views/projects/pipeline_schedules/_form.html.haml
locale/en/gitlab.po
locale/es/gitlab.po
locale/gitlab.pot
Diffstat (limited to 'app/views/projects/commits/_commit.html.haml')
| -rw-r--r-- | app/views/projects/commits/_commit.html.haml | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/app/views/projects/commits/_commit.html.haml b/app/views/projects/commits/_commit.html.haml index 7a03c3561af..11de6915961 100644 --- a/app/views/projects/commits/_commit.html.haml +++ b/app/views/projects/commits/_commit.html.haml @@ -30,9 +30,11 @@ %pre.commit-row-description.js-toggle-content = preserve(markdown(commit.description, pipeline: :single_line, author: commit.author)) .commiter - = commit_author_link(commit, avatar: false, size: 24) - #{ _('committed') } - #{time_ago_with_tooltip(commit.committed_date)} + - commit_author_link = commit_author_link(commit, avatar: false, size: 24) + - commit_timeago = time_ago_with_tooltip(commit.committed_date) + - commit_text = _('%{commit_author_link} committed %{commit_timeago}') % { commit_author_link: commit_author_link, commit_timeago: commit_timeago } + #{ commit_text.html_safe } + .commit-actions.flex-row.hidden-xs - if commit.status(ref) |