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
6130376a
Commit
6130376a
authored
Jul 20, 2016
by
Annabel Dunstone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bug fixes
parent
4e40ba93
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
5 deletions
+19
-5
app/assets/stylesheets/pages/commit.scss
app/assets/stylesheets/pages/commit.scss
+8
-0
app/assets/stylesheets/pages/pipelines.scss
app/assets/stylesheets/pages/pipelines.scss
+5
-1
app/views/projects/ci/builds/_build.html.haml
app/views/projects/ci/builds/_build.html.haml
+6
-4
No files found.
app/assets/stylesheets/pages/commit.scss
View file @
6130376a
...
@@ -66,6 +66,14 @@
...
@@ -66,6 +66,14 @@
margin-left
:
8px
;
margin-left
:
8px
;
}
}
}
}
.ci-status-link
{
svg
{
position
:
relative
;
top
:
2px
;
margin
:
0
3px
;
}
}
}
}
.commit-box
{
.commit-box
{
...
...
app/assets/stylesheets/pages/pipelines.scss
View file @
6130376a
...
@@ -93,7 +93,7 @@
...
@@ -93,7 +93,7 @@
.commit-title
{
.commit-title
{
margin-top
:
4px
;
margin-top
:
4px
;
max-width
:
3
2
0px
;
max-width
:
3
0
0px
;
overflow
:
hidden
;
overflow
:
hidden
;
white-space
:
nowrap
;
white-space
:
nowrap
;
text-overflow
:
ellipsis
;
text-overflow
:
ellipsis
;
...
@@ -139,6 +139,10 @@
...
@@ -139,6 +139,10 @@
width
:
18px
;
width
:
18px
;
vertical-align
:
middle
;
vertical-align
:
middle
;
}
}
.light
{
width
:
3px
;
}
}
}
.duration
,
.duration
,
...
...
app/views/projects/ci/builds/_build.html.haml
View file @
6130376a
...
@@ -14,16 +14,19 @@
...
@@ -14,16 +14,19 @@
%span
##{build.id}
%span
##{build.id}
-
if
build
.
stuck?
-
if
build
.
stuck?
=
icon
(
'warning'
,
class:
'text-warning has-tooltip'
,
title:
'Build is stuck. Check runners.'
)
.icon-container
=
icon
(
'warning'
,
class:
'text-warning has-tooltip'
,
title:
'Build is stuck. Check runners.'
)
-
if
defined?
(
retried
)
&&
retried
-
if
defined?
(
retried
)
&&
retried
=
icon
(
'warning'
,
class:
'text-warning has-tooltip'
,
title:
'Build was retried.'
)
.icon-container
=
icon
(
'warning'
,
class:
'text-warning has-tooltip'
,
title:
'Build was retried.'
)
-
if
defined?
(
ref
)
&&
ref
-
if
defined?
(
ref
)
&&
ref
-
if
build
.
ref
-
if
build
.
ref
=
link_to
build
.
ref
,
namespace_project_commits_path
(
build
.
project
.
namespace
,
build
.
project
,
build
.
ref
),
class:
"monospace branch-name"
=
link_to
build
.
ref
,
namespace_project_commits_path
(
build
.
project
.
namespace
,
build
.
project
,
build
.
ref
),
class:
"monospace branch-name"
-
else
-
else
.light
none
.light
none
=
custom_icon
(
"icon_commit"
)
.icon-container
=
custom_icon
(
"icon_commit"
)
-
if
defined?
(
commit_sha
)
&&
commit_sha
-
if
defined?
(
commit_sha
)
&&
commit_sha
=
link_to
build
.
short_sha
,
namespace_project_commit_path
(
build
.
project
.
namespace
,
build
.
project
,
build
.
sha
),
class:
"commit-id monospace"
=
link_to
build
.
short_sha
,
namespace_project_commit_path
(
build
.
project
.
namespace
,
build
.
project
,
build
.
sha
),
class:
"commit-id monospace"
...
@@ -88,4 +91,3 @@
...
@@ -88,4 +91,3 @@
-
elsif
build
.
playable?
-
elsif
build
.
playable?
=
link_to
play_namespace_project_build_path
(
build
.
project
.
namespace
,
build
.
project
,
build
,
return_to:
request
.
original_url
),
method: :post
,
title:
'Play'
,
class:
'btn btn-build'
do
=
link_to
play_namespace_project_build_path
(
build
.
project
.
namespace
,
build
.
project
,
build
,
return_to:
request
.
original_url
),
method: :post
,
title:
'Play'
,
class:
'btn btn-build'
do
=
icon
(
'play'
)
=
icon
(
'play'
)
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