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
iv
gitlab-ce
Commits
8827eea8
Commit
8827eea8
authored
May 24, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated commits UI
Closes #14633
parent
915ad255
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
104 additions
and
96 deletions
+104
-96
app/assets/stylesheets/pages/commits.scss
app/assets/stylesheets/pages/commits.scss
+60
-54
app/helpers/ci_status_helper.rb
app/helpers/ci_status_helper.rb
+4
-4
app/helpers/commits_helper.rb
app/helpers/commits_helper.rb
+19
-7
app/views/projects/commits/_commit.html.haml
app/views/projects/commits/_commit.html.haml
+10
-11
app/views/projects/commits/_commits.html.haml
app/views/projects/commits/_commits.html.haml
+5
-12
app/views/projects/commits/show.html.haml
app/views/projects/commits/show.html.haml
+4
-7
app/views/projects/merge_requests/show/_commits.html.haml
app/views/projects/merge_requests/show/_commits.html.haml
+2
-1
No files found.
app/assets/stylesheets/pages/commits.scss
View file @
8827eea8
...
...
@@ -7,50 +7,27 @@
margin-right
:
9px
;
}
.lists-separator
{
margin
:
10px
0
;
border-color
:
#ddd
;
}
.commits-row
{
ul
{
margin
:
0
;
li
.commit
{
padding
:
8px
0
;
}
}
.commit-header
{
padding
:
5px
10px
;
background-color
:
$background-color
;
border-top
:
1px
solid
$border-color
;
border-bottom
:
1px
solid
$border-color
;
font-size
:
14px
;
.commits-row-date
{
font-size
:
15px
;
line-height
:
20px
;
margin-bottom
:
5px
;
&
:first-child
{
border-top-width
:
0
;
}
}
li
.commit
{
list-style
:
none
;
.commit-row-title
{
font-size
:
$list-font-size
;
.commit-row-title
{
line-height
:
20px
;
margin-bottom
:
2px
;
.btn-clipboard
{
margin-top
:
-1px
;
}
.notes_count
{
float
:
right
;
margin-right
:
10px
;
}
.commit_short_id
{
min-width
:
65px
;
color
:
$gl-dark-link-color
;
font-family
:
$monospace_font
;
}
.str-truncated
{
max-width
:
70%
;
}
...
...
@@ -73,6 +50,39 @@ li.commit {
background-color
:
#ddd
;
}
}
}
.commit-actions
{
@media
(
min-width
:
$screen-md-min
)
{
float
:
right
;
}
}
.commit-short-id
{
font-family
:
$monospace_font
;
font-weight
:
600
;
}
.commit
{
padding
:
10px
0
10px
55px
;
&
:not
(
:last-child
)
{
border-bottom
:
1px
solid
#eee
;
}
a
{
color
:
$gl-dark-link-color
;
}
.commit-link
{
&
:hover
{
color
:
$gl-link-color
;
text-decoration
:
none
;
}
}
.avatar
{
margin-left
:
-55px
;
}
.item-title
{
...
...
@@ -84,7 +94,7 @@ li.commit {
font-size
:
14px
;
border-left
:
1px
solid
#eee
;
padding
:
10px
15px
;
margin
:
5px
0
10px
5px
;
margin
:
10px
0
10px
0
;
background
:
#f9f9f9
;
display
:
none
;
...
...
@@ -111,10 +121,6 @@ li.commit {
.avatar
{
margin-right
:
8px
;
}
.committed_ago
{
display
:
inline-block
;
}
}
&
.inline-commit
{
...
...
app/helpers/ci_status_helper.rb
View file @
8827eea8
...
...
@@ -38,10 +38,10 @@ module CiStatusHelper
icon
(
icon_name
+
' fw'
)
end
def
render_commit_status
(
commit
,
tooltip_placement:
'auto left'
)
def
render_commit_status
(
commit
,
tooltip_placement:
'auto left'
,
cssclass:
''
)
project
=
commit
.
project
path
=
builds_namespace_project_commit_path
(
project
.
namespace
,
project
,
commit
)
render_status_with_link
(
'commit'
,
commit
.
status
,
path
,
tooltip_placement
)
render_status_with_link
(
'commit'
,
commit
.
status
,
path
,
tooltip_placement
,
cssclass:
cssclass
)
end
def
render_pipeline_status
(
pipeline
,
tooltip_placement:
'auto left'
)
...
...
@@ -57,10 +57,10 @@ module CiStatusHelper
private
def
render_status_with_link
(
type
,
status
,
path
,
tooltip_placement
)
def
render_status_with_link
(
type
,
status
,
path
,
tooltip_placement
,
cssclass:
''
)
link_to
ci_icon_for_status
(
status
),
path
,
class:
"ci-status-link ci-status-icon-
#{
status
.
dasherize
}
"
,
class:
"ci-status-link ci-status-icon-
#{
status
.
dasherize
}
#{
cssclass
}
"
,
title:
"
#{
type
.
titleize
}
:
#{
ci_label_for_status
(
status
)
}
"
,
data:
{
toggle:
'tooltip'
,
placement:
tooltip_placement
}
end
...
...
app/helpers/commits_helper.rb
View file @
8827eea8
...
...
@@ -16,6 +16,19 @@ module CommitsHelper
commit_person_link
(
commit
,
options
.
merge
(
source: :committer
))
end
def
commit_author_avatar
(
commit
,
options
=
{})
options
=
options
.
merge
(
source: :author
)
user
=
commit
.
send
(
options
[
:source
])
source_name
=
clean
(
commit
.
send
"
#{
options
[
:source
]
}
_name"
.
to_sym
)
source_email
=
clean
(
commit
.
send
"
#{
options
[
:source
]
}
_email"
.
to_sym
)
person_name
=
user
.
try
(
:name
)
||
source_name
person_email
=
user
.
try
(
:email
)
||
source_email
image_tag
(
avatar_icon
(
person_email
,
options
[
:size
]),
class:
"avatar
#{
"s
#{
options
[
:size
]
}
"
if
options
[
:size
]
}
"
,
width:
options
[
:size
],
alt:
""
)
end
def
image_diff_class
(
diff
)
if
diff
.
deleted_file
"deleted"
...
...
@@ -102,24 +115,24 @@ module CommitsHelper
if
current_controller?
(
:projects
,
:commits
)
if
@repo
.
blob_at
(
commit
.
id
,
@path
)
return
link_to
(
"Browse File
»
"
,
"Browse File"
,
namespace_project_blob_path
(
project
.
namespace
,
project
,
tree_join
(
commit
.
id
,
@path
)),
class:
"
pull-righ
t"
class:
"
btn btn-defaul
t"
)
elsif
@path
.
present?
return
link_to
(
"Browse Directory
»
"
,
"Browse Directory"
,
namespace_project_tree_path
(
project
.
namespace
,
project
,
tree_join
(
commit
.
id
,
@path
)),
class:
"
pull-righ
t"
class:
"
btn btn-defaul
t"
)
end
end
link_to
(
"Browse Files"
,
namespace_project_tree_path
(
project
.
namespace
,
project
,
commit
),
class:
"
pull-righ
t"
class:
"
btn btn-defaul
t"
)
end
...
...
@@ -191,8 +204,7 @@ module CommitsHelper
text
=
if
options
[
:avatar
]
avatar
=
image_tag
(
avatar_icon
(
person_email
,
options
[
:size
]),
class:
"avatar
#{
"s
#{
options
[
:size
]
}
"
if
options
[
:size
]
}
"
,
width:
options
[
:size
],
alt:
""
)
%Q{
#{
avatar
}
<span class="commit-
#{
options
[
:source
]
}
-name">
#{
person_name
}
</span>}
%Q{<span class="commit-
#{
options
[
:source
]
}
-name">
#{
person_name
}
</span>}
else
person_name
end
...
...
app/views/projects/commits/_commit.html.haml
View file @
8827eea8
...
...
@@ -9,26 +9,25 @@
=
cache
(
cache_key
)
do
%li
.commit.js-toggle-container
{
id:
"commit-#{commit.short_id}"
}
=
commit_author_avatar
(
commit
)
.commit-row-title
%span
.item-title
=
link_to_gfm
commit
.
title
,
namespace_project_commit_path
(
project
.
namespace
,
project
,
commit
.
id
),
class:
"commit-row-message"
=
link_to_gfm
commit
.
title
,
namespace_project_commit_path
(
project
.
namespace
,
project
,
commit
.
id
),
class:
"commit-row-message
commit-link
"
-
if
commit
.
description?
%a
.text-expander.js-toggle-button
...
.
pull-right
.
commit-actions
-
if
commit
.
status
=
render_commit_status
(
commit
)
=
render_commit_status
(
commit
,
cssclass:
'btn btn-transparent'
)
=
clipboard_button
(
clipboard_text:
commit
.
id
)
=
link_to
commit
.
short_id
,
namespace_project_commit_path
(
project
.
namespace
,
project
,
commit
),
class:
"commit_short_id"
=
link_to
commit
.
short_id
,
namespace_project_commit_path
(
project
.
namespace
,
project
,
commit
),
class:
"commit-short-id btn btn-transparent commit-link"
=
link_to_browse_code
(
project
,
commit
)
-
if
commit
.
description?
.commit-row-description.js-toggle-content
%pre
%pre
.commit-row-description.js-toggle-content
=
preserve
(
markdown
(
escape_once
(
commit
.
description
),
pipeline: :single_line
,
author:
commit
.
author
))
.commit-row-info
by
=
commit_author_link
(
commit
,
avatar:
true
,
size:
24
)
.committed_ago
authored
#{
time_ago_with_tooltip
(
commit
.
committed_date
)
}
=
link_to_browse_code
(
project
,
commit
)
app/views/projects/commits/_commits.html.haml
View file @
8827eea8
...
...
@@ -4,18 +4,11 @@
-
commits
,
hidden
=
limited_commits
(
@commits
)
-
commits
.
chunk
{
|
c
|
c
.
committed_date
.
in_time_zone
.
to_date
}.
each
do
|
day
,
commits
|
.row.commits-row
.col-md-2.hidden-xs.hidden-sm
%h5
.commits-row-date
%i
.fa.fa-calendar
%span
=
day
.
strftime
(
'%d %b, %Y'
)
.light
=
pluralize
(
commits
.
count
,
'commit'
)
.col-md-10.col-sm-12
%ul
.content-list
%li
.commit-header
=
"
#{
day
.
strftime
(
'%d %b, %Y'
)
}
#{
pluralize
(
commits
.
count
,
'commit'
)
}
"
%li
.commits-row
%ul
.list-unstyled.commit-list
=
render
commits
,
project:
project
%hr
.lists-separator
-
if
hidden
>
0
.alert.alert-warning
%li
.alert.alert-warning
#{
number_with_delimiter
(
hidden
)
}
additional commits have been omitted to prevent performance issues.
app/views/projects/commits/show.html.haml
View file @
8827eea8
...
...
@@ -23,21 +23,18 @@
Create Merge Request
.control
=
form_tag
(
namespace_project_commits_path
(
@project
.
namespace
,
@project
,
@id
),
method: :get
,
class:
'pull-left commits-search-form'
)
do
=
search_field_tag
:search
,
params
[
:search
],
{
placeholder:
'Filter by commit message'
,
id:
'commits-search'
,
class:
'form-control search-text-input'
,
spellcheck:
false
}
=
form_tag
(
namespace_project_commits_path
(
@project
.
namespace
,
@project
,
@id
),
method: :get
,
class:
'commits-search-form'
)
do
=
search_field_tag
:search
,
params
[
:search
],
{
placeholder:
'Filter by commit message'
,
id:
'commits-search'
,
class:
'form-control search-text-input input-short'
,
spellcheck:
false
}
-
if
current_user
&&
current_user
.
private_token
.control
=
link_to
namespace_project_commits_path
(
@project
.
namespace
,
@project
,
@ref
,
{
format: :atom
,
private_token:
current_user
.
private_token
}),
title:
"Commits Feed"
,
class:
'btn'
do
=
icon
(
"rss"
)
%ul
.breadcrumb.repo-breadcrumb
=
commits_breadcrumbs
%div
{
id:
dom_id
(
@project
)}
#commits-list
.content_list
=
render
"commits"
,
project:
@projec
t
.clear
%ol
#commits-list
.list-unstyled.content_lis
t
=
render
"commits"
,
project:
@project
=
spinner
:javascript
...
...
app/views/projects/merge_requests/show/_commits.html.haml
View file @
8827eea8
...
...
@@ -2,4 +2,5 @@
=
icon
(
"sort-amount-desc"
)
Most recent commits displayed first
=
render
"projects/commits/commits"
,
project:
@merge_request
.
project
%ol
#commits-list
.list-unstyled
=
render
"projects/commits/commits"
,
project:
@merge_request
.
project
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