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
Jérome Perrin
gitlab-ce
Commits
8ed105bf
Commit
8ed105bf
authored
Jul 11, 2016
by
Annabel Dunstone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix label alignment bug; re-add build-link
parent
c57471dd
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
17 deletions
+20
-17
app/assets/stylesheets/pages/pipelines.scss
app/assets/stylesheets/pages/pipelines.scss
+4
-1
app/views/admin/builds/_build.html.haml
app/views/admin/builds/_build.html.haml
+8
-8
app/views/projects/ci/builds/_build.html.haml
app/views/projects/ci/builds/_build.html.haml
+8
-8
No files found.
app/assets/stylesheets/pages/pipelines.scss
View file @
8ed105bf
...
@@ -81,7 +81,10 @@
...
@@ -81,7 +81,10 @@
}
}
.label-container
{
.label-container
{
margin-top
:
5px
;
.label
{
margin-top
:
5px
;
}
}
}
}
}
...
...
app/views/admin/builds/_build.html.haml
View file @
8ed105bf
...
@@ -7,9 +7,9 @@
...
@@ -7,9 +7,9 @@
.branch-commit
.branch-commit
-
if
can?
(
current_user
,
:read_build
,
build
.
project
)
-
if
can?
(
current_user
,
:read_build
,
build
.
project
)
=
link_to
namespace_project_build_url
(
build
.
project
.
namespace
,
build
.
project
,
build
)
do
=
link_to
namespace_project_build_url
(
build
.
project
.
namespace
,
build
.
project
,
build
)
do
%span
##{build.id}
%span
.build-link
##{build.id}
-
else
-
else
%span
##{build.id}
%span
.build-link
##{build.id}
-
if
build
.
stuck?
-
if
build
.
stuck?
%i
.fa.fa-warning.text-warning
%i
.fa.fa-warning.text-warning
...
@@ -22,15 +22,15 @@
...
@@ -22,15 +22,15 @@
=
link_to
build
.
short_sha
,
namespace_project_commit_path
(
build
.
project
.
namespace
,
build
.
project
,
build
.
sha
),
class:
"monospace commit-id"
=
link_to
build
.
short_sha
,
namespace_project_commit_path
(
build
.
project
.
namespace
,
build
.
project
,
build
.
sha
),
class:
"monospace commit-id"
-
if
build
.
tags
.
any?
.label-container
.label-container
-
if
build
.
tags
.
any?
-
build
.
tags
.
each
do
|
tag
|
-
build
.
tags
.
each
do
|
tag
|
%span
.label.label-primary
%span
.label.label-primary
=
tag
=
tag
-
if
build
.
try
(
:trigger_request
)
-
if
build
.
try
(
:trigger_request
)
%span
.label.label-info
triggered
%span
.label.label-info
triggered
-
if
build
.
try
(
:allow_failure
)
-
if
build
.
try
(
:allow_failure
)
%span
.label.label-danger
allowed to fail
%span
.label.label-danger
allowed to fail
%td
%td
-
if
project
-
if
project
...
...
app/views/projects/ci/builds/_build.html.haml
View file @
8ed105bf
...
@@ -28,17 +28,17 @@
...
@@ -28,17 +28,17 @@
-
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"
-
if
build
.
tags
.
any?
.label-container
.label-container
-
if
build
.
tags
.
any?
-
build
.
tags
.
each
do
|
tag
|
-
build
.
tags
.
each
do
|
tag
|
%span
.label.label-primary
%span
.label.label-primary
=
tag
=
tag
-
if
build
.
try
(
:trigger_request
)
-
if
build
.
try
(
:trigger_request
)
%span
.label.label-info
triggered
%span
.label.label-info
triggered
-
if
build
.
try
(
:allow_failure
)
-
if
build
.
try
(
:allow_failure
)
%span
.label.label-danger
allowed to fail
%span
.label.label-danger
allowed to fail
-
if
defined?
(
retried
)
&&
retried
-
if
defined?
(
retried
)
&&
retried
%span
.label.label-warning
retried
%span
.label.label-warning
retried
-
if
defined?
(
runner
)
&&
runner
-
if
defined?
(
runner
)
&&
runner
...
...
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