Skip to content
Snippets Groups Projects
Commit 48895aa4 authored by BM5k's avatar BM5k
Browse files

change the date label to match the date used

parent 24e5a1e8
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -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
Loading
Loading
Loading
Loading
@@ -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)}
---
title: change text around timestamps to make it clear which timestamp is displayed
merge_request: 7860
author: BM5k
Loading
Loading
@@ -177,4 +177,23 @@ describe 'Commits' do
end
end
end
context 'viewing commits for a branch' do
let(:branch_name) { 'master' }
let(:user) { create(:user) }
before do
project.team << [user, :master]
login_with(user)
visit namespace_project_commits_path(project.namespace, project, branch_name)
end
it 'includes the committed_date for each commit' do
commits = project.repository.commits(branch_name)
commits.each do |commit|
expect(page).to have_content("committed #{commit.committed_date}")
end
end
end
end
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment