Commit 9e61d04d authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray

Port of 25317-prioritize-author-date-over-commit to EE

parent a24d2842
...@@ -42,8 +42,8 @@ ...@@ -42,8 +42,8 @@
.commiter .commiter
- commit_author_link = commit_author_link(commit, avatar: false, size: 24) - commit_author_link = commit_author_link(commit, avatar: false, size: 24)
- commit_timeago = time_ago_with_tooltip(commit.committed_date, placement: 'bottom') - commit_timeago = time_ago_with_tooltip(commit.authored_date, placement: 'bottom')
- commit_text = _('%{commit_author_link} committed %{commit_timeago}') % { commit_author_link: commit_author_link, commit_timeago: commit_timeago } - commit_text = _('%{commit_author_link} authored %{commit_timeago}') % { commit_author_link: commit_author_link, commit_timeago: commit_timeago }
#{ commit_text.html_safe } #{ commit_text.html_safe }
- if show_project_name - if show_project_name
%span.project_namespace %span.project_namespace
......
---
title: Show authored date rather than committed date on the commit list
merge_request:
author:
type: fixed
...@@ -197,7 +197,7 @@ describe 'Commits' do ...@@ -197,7 +197,7 @@ describe 'Commits' do
commits = project.repository.commits(branch_name) commits = project.repository.commits(branch_name)
commits.each do |commit| commits.each do |commit|
expect(page).to have_content("committed #{commit.committed_date.strftime("%b %d, %Y")}") expect(page).to have_content("authored #{commit.authored_date.strftime("%b %d, %Y")}")
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment