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
Boxiang Sun
gitlab-ce
Commits
942de350
Commit
942de350
authored
Nov 09, 2016
by
Mike Greiling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update generic commit status to correspond with build status template
parent
0afbe8fc
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
2 deletions
+11
-2
app/assets/stylesheets/pages/commits.scss
app/assets/stylesheets/pages/commits.scss
+2
-2
app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml
.../generic_commit_statuses/_generic_commit_status.html.haml
+9
-0
No files found.
app/assets/stylesheets/pages/commits.scss
View file @
942de350
...
@@ -84,7 +84,8 @@
...
@@ -84,7 +84,8 @@
font-weight
:
600
;
font-weight
:
600
;
}
}
.commit
{
.commit
,
.generic_commit_status
{
padding
:
10px
0
;
padding
:
10px
0
;
position
:
relative
;
position
:
relative
;
...
@@ -102,7 +103,6 @@
...
@@ -102,7 +103,6 @@
vertical-align
:
baseline
;
vertical-align
:
baseline
;
}
}
.avatar
{
.avatar
{
margin-left
:
-46px
;
margin-left
:
-46px
;
}
}
...
...
app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml
View file @
942de350
...
@@ -15,6 +15,15 @@
...
@@ -15,6 +15,15 @@
-
if
defined?
(
retried
)
&&
retried
-
if
defined?
(
retried
)
&&
retried
=
icon
(
'warning'
,
class:
'text-warning has-tooltip'
,
title:
'Status was retried.'
)
=
icon
(
'warning'
,
class:
'text-warning has-tooltip'
,
title:
'Status was retried.'
)
%td
=
link_to
pipeline_path
(
generic_commit_status
.
pipeline
)
do
%span
.pipeline-id
##{generic_commit_status.pipeline.id}
%span
by
-
if
generic_commit_status
.
pipeline
.
user
=
user_avatar
(
user:
generic_commit_status
.
pipeline
.
user
,
size:
20
)
-
else
%span
.api.monospace
API
-
if
defined?
(
commit_sha
)
&&
commit_sha
-
if
defined?
(
commit_sha
)
&&
commit_sha
%td
%td
=
link_to
generic_commit_status
.
short_sha
,
namespace_project_commit_path
(
generic_commit_status
.
project
.
namespace
,
generic_commit_status
.
project
,
generic_commit_status
.
sha
),
class:
"monospace"
=
link_to
generic_commit_status
.
short_sha
,
namespace_project_commit_path
(
generic_commit_status
.
project
.
namespace
,
generic_commit_status
.
project
,
generic_commit_status
.
sha
),
class:
"monospace"
...
...
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