diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-12-14 10:32:30 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-12-14 10:32:30 +0000 |
| commit | c74e556d89bb74fa09e38b8680981a466c88fd20 (patch) | |
| tree | d38d0401526299925a70a1bb0cb0ff9ca7349e28 /app | |
| parent | 5478fe4288b6f7d4e29caa643a12248376a3e4b9 (diff) | |
| parent | c2dc6965bbda0a705dae8870bfc3afca8dd75bd5 (diff) | |
| download | gitlab-ce-c74e556d89bb74fa09e38b8680981a466c88fd20.tar.gz | |
Merge branch '25317-prioritize-author-date-over-commit' into 'master'
Use author info on commits list page rather than most recent commit date
Closes #25317
See merge request gitlab-org/gitlab-ce!15868
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/projects/commits/_commit.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/commits/_commit.html.haml b/app/views/projects/commits/_commit.html.haml index 618a6355d23..d66066a6d0b 100644 --- a/app/views/projects/commits/_commit.html.haml +++ b/app/views/projects/commits/_commit.html.haml @@ -38,8 +38,8 @@ .commiter - commit_author_link = commit_author_link(commit, avatar: false, size: 24) - - commit_timeago = time_ago_with_tooltip(commit.committed_date, placement: 'bottom') - - commit_text = _('%{commit_author_link} committed %{commit_timeago}') % { commit_author_link: commit_author_link, commit_timeago: commit_timeago } + - commit_timeago = time_ago_with_tooltip(commit.authored_date, placement: 'bottom') + - commit_text = _('%{commit_author_link} authored %{commit_timeago}') % { commit_author_link: commit_author_link, commit_timeago: commit_timeago } #{ commit_text.html_safe } .commit-actions.flex-row.hidden-xs |