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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
9e61d04d
Commit
9e61d04d
authored
Dec 11, 2017
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Port of 25317-prioritize-author-date-over-commit to EE
parent
a24d2842
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
3 deletions
+8
-3
app/views/projects/commits/_commit.html.haml
app/views/projects/commits/_commit.html.haml
+2
-2
changelogs/unreleased/25317-prioritize-author-date-over-commit.yml
...s/unreleased/25317-prioritize-author-date-over-commit.yml
+5
-0
spec/features/commits_spec.rb
spec/features/commits_spec.rb
+1
-1
No files found.
app/views/projects/commits/_commit.html.haml
View file @
9e61d04d
...
...
@@ -42,8 +42,8 @@
.commiter
-
commit_author_link
=
commit_author_link
(
commit
,
avatar:
false
,
size:
24
)
-
commit_timeago
=
time_ago_with_tooltip
(
commit
.
committ
ed_date
,
placement:
'bottom'
)
-
commit_text
=
_
(
'%{commit_author_link}
committ
ed %{commit_timeago}'
)
%
{
commit_author_link:
commit_author_link
,
commit_timeago:
commit_timeago
}
-
commit_timeago
=
time_ago_with_tooltip
(
commit
.
author
ed_date
,
placement:
'bottom'
)
-
commit_text
=
_
(
'%{commit_author_link}
author
ed %{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
0 → 100644
View file @
9e61d04d
---
title
:
Show authored date rather than committed date on the commit list
merge_request
:
author
:
type
:
fixed
spec/features/commits_spec.rb
View file @
9e61d04d
...
...
@@ -197,7 +197,7 @@ describe 'Commits' do
commits
=
project
.
repository
.
commits
(
branch_name
)
commits
.
each
do
|
commit
|
expect
(
page
).
to
have_content
(
"
committed
#{
commit
.
committ
ed_date
.
strftime
(
"%b %d, %Y"
)
}
"
)
expect
(
page
).
to
have_content
(
"
authored
#{
commit
.
author
ed_date
.
strftime
(
"%b %d, %Y"
)
}
"
)
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