Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
48895aa4
Commit
48895aa4
authored
Nov 30, 2016
by
BM5k
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
change the date label to match the date used
parent
24e5a1e8
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
25 additions
and
2 deletions
+25
-2
app/views/projects/blame/show.html.haml
app/views/projects/blame/show.html.haml
+1
-1
app/views/projects/commits/_commit.html.haml
app/views/projects/commits/_commit.html.haml
+1
-1
changelogs/unreleased/issues-1608-text.yml
changelogs/unreleased/issues-1608-text.yml
+4
-0
spec/features/commits_spec.rb
spec/features/commits_spec.rb
+19
-0
No files found.
app/views/projects/blame/show.html.haml
View file @
48895aa4
...
...
@@ -31,7 +31,7 @@
.light
=
commit_author_link
(
commit
,
avatar:
false
)
author
ed
committ
ed
#{
time_ago_with_tooltip
(
commit
.
committed_date
)
}
%td
.line-numbers
-
line_count
=
blame_group
[
:lines
].
count
...
...
app/views/projects/commits/_commit.html.haml
View file @
48895aa4
...
...
@@ -37,5 +37,5 @@
=
preserve
(
markdown
(
commit
.
description
,
pipeline: :single_line
,
author:
commit
.
author
))
=
commit_author_link
(
commit
,
avatar:
false
,
size:
24
)
author
ed
committ
ed
#{
time_ago_with_tooltip
(
commit
.
committed_date
)
}
changelogs/unreleased/issues-1608-text.yml
0 → 100644
View file @
48895aa4
---
title
:
change text around timestamps to make it clear which timestamp is displayed
merge_request
:
7860
author
:
BM5k
spec/features/commits_spec.rb
View file @
48895aa4
...
...
@@ -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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment