diff options
| author | BM5k <me@bm5k.com> | 2016-11-30 14:28:42 -0700 |
|---|---|---|
| committer | BM5k <me@bm5k.com> | 2016-12-03 14:39:35 -0700 |
| commit | 48895aa40dd2bfc13453b0b28c6d122f4e1c58be (patch) | |
| tree | 9dd960eca4ef57b87d6e4c37c6007573e5d673b0 | |
| parent | 24e5a1e8db943be346b4f7f4fb49326ad0e5eb9e (diff) | |
| download | gitlab-ce-48895aa40dd2bfc13453b0b28c6d122f4e1c58be.tar.gz | |
change the date label to match the date used
| -rw-r--r-- | app/views/projects/blame/show.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/commits/_commit.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/issues-1608-text.yml | 4 | ||||
| -rw-r--r-- | spec/features/commits_spec.rb | 19 |
4 files changed, 25 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)} diff --git a/changelogs/unreleased/issues-1608-text.yml b/changelogs/unreleased/issues-1608-text.yml new file mode 100644 index 00000000000..bef427a1e1e --- /dev/null +++ b/changelogs/unreleased/issues-1608-text.yml @@ -0,0 +1,4 @@ +--- +title: change text around timestamps to make it clear which timestamp is displayed +merge_request: 7860 +author: BM5k diff --git a/spec/features/commits_spec.rb b/spec/features/commits_spec.rb index 44646ffc602..23a504ff965 100644 --- a/spec/features/commits_spec.rb +++ b/spec/features/commits_spec.rb @@ -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 |