Merge branch 'ee-25317-prioritize-author-date-over-commit' into 'master'

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

See merge request gitlab-org/gitlab-ee!3766

app/views/projects/commits/_commit.html.haml

@@ -42,8 +42,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 }
         - if show_project_name
           %span.project_namespace

changelogs/unreleased/25317-prioritize-author-date-over-commit.yml

+---
+title: Show authored date rather than committed date on the commit list
+merge_request:
+author:
+type: fixed

spec/features/commits_spec.rb

@@ -197,7 +197,7 @@ describe 'Commits' do
       commits = project.repository.commits(branch_name)
 
       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