diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2016-12-05 16:21:22 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2016-12-05 16:21:22 +0300 |
| commit | 5d8c33423c436036113ad2a4557b5b10df045ebb (patch) | |
| tree | ccacba2e5cabfecc4d392b39acd3fc11bedbc2c3 /app/views | |
| parent | 024ca242b4cdb6f64abb0148952796967d13104b (diff) | |
| parent | 48895aa40dd2bfc13453b0b28c6d122f4e1c58be (diff) | |
Merge branch 'issues/1608-text' into 'master'
change the date label to match the date used
Closes #1608
See merge request !7860
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/blame/show.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/commits/_commit.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/blame/show.html.haml b/app/views/projects/blame/show.html.haml index cadfe5a3e30..f63802ac88b 100644 --- a/app/views/projects/blame/show.html.haml +++ b/app/views/projects/blame/show.html.haml @@ -31,7 +31,7 @@ .light = commit_author_link(commit, avatar: false) - authored + committed #{time_ago_with_tooltip(commit.committed_date)} %td.line-numbers - line_count = blame_group[:lines].count diff --git a/app/views/projects/commits/_commit.html.haml b/app/views/projects/commits/_commit.html.haml index 12096941209..a940515fadf 100644 --- a/app/views/projects/commits/_commit.html.haml +++ b/app/views/projects/commits/_commit.html.haml @@ -37,5 +37,5 @@ = preserve(markdown(commit.description, pipeline: :single_line, author: commit.author)) = commit_author_link(commit, avatar: false, size: 24) - authored + committed #{time_ago_with_tooltip(commit.committed_date)} |