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
Tatuya Kamada
gitlab-ce
Commits
84d2cab6
Commit
84d2cab6
authored
Aug 20, 2016
by
Luke Bennett
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Moved builds panel to the bottom of the builds sidemenu
parent
9b079219
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
36 additions
and
36 deletions
+36
-36
app/assets/stylesheets/pages/builds.scss
app/assets/stylesheets/pages/builds.scss
+1
-2
app/views/projects/builds/_sidebar.html.haml
app/views/projects/builds/_sidebar.html.haml
+35
-34
No files found.
app/assets/stylesheets/pages/builds.scss
View file @
84d2cab6
...
@@ -131,7 +131,7 @@
...
@@ -131,7 +131,7 @@
}
}
.build-dropdown
{
.build-dropdown
{
padding
:
0
$gl-padding
;
padding
:
$gl-padding
0
;
.dropdown-menu-toggle
{
.dropdown-menu-toggle
{
margin-top
:
8px
;
margin-top
:
8px
;
...
@@ -145,7 +145,6 @@
...
@@ -145,7 +145,6 @@
}
}
.builds-container
{
.builds-container
{
margin-top
:
$gl-padding
;
background-color
:
$white-light
;
background-color
:
$white-light
;
border-top
:
1px
solid
$border-color
;
border-top
:
1px
solid
$border-color
;
border-bottom
:
1px
solid
$border-color
;
border-bottom
:
1px
solid
$border-color
;
...
...
app/views/projects/builds/_sidebar.html.haml
View file @
84d2cab6
-
builds
=
@build
.
pipeline
.
builds
.
latest
.
to_a
-
statuses
=
[
"failed"
,
"pending"
,
"running"
,
"canceled"
,
"success"
,
"skipped"
]
%aside
.right-sidebar.right-sidebar-expanded.build-sidebar.js-build-sidebar
%aside
.right-sidebar.right-sidebar-expanded.build-sidebar.js-build-sidebar
.block.build-sidebar-header.visible-xs-block.visible-sm-block.append-bottom-default
.block.build-sidebar-header.visible-xs-block.visible-sm-block.append-bottom-default
Build
Build
...
@@ -11,40 +14,6 @@
...
@@ -11,40 +14,6 @@
%p
.build-detail-row
%p
.build-detail-row
#{
@build
.
coverage
}
%
#{
@build
.
coverage
}
%
-
builds
=
@build
.
pipeline
.
builds
.
latest
.
to_a
-
statuses
=
[
"failed"
,
"pending"
,
"running"
,
"canceled"
,
"success"
,
"skipped"
]
-
if
builds
.
size
>
1
.dropdown.build-dropdown
.build-light-text
Stage
%button
.dropdown-menu-toggle
{
type:
'button'
,
'data-toggle'
=>
'dropdown'
}
%span
.stage-selection
More
=
icon
(
'caret-down'
)
%ul
.dropdown-menu
-
builds
.
map
(
&
:stage
).
uniq
.
each
do
|
stage
|
%li
%a
.stage-item
=
stage
.builds-container
-
statuses
.
each
do
|
build_status
|
-
builds
.
select
{
|
build
|
build
.
status
==
build_status
}.
each
do
|
build
|
.build-job
{
class:
(
'active'
if
build
==
@build
),
data:
{
stage:
build
.
stage
}}
=
link_to
namespace_project_build_path
(
@project
.
namespace
,
@project
,
build
)
do
=
icon
(
'check'
)
=
ci_icon_for_status
(
build
.
status
)
%span
-
if
build
.
name
=
build
.
name
-
else
=
build
.
id
-
if
@build
.
retried?
%li
.active
%a
Build ##{@build.id}
·
%i
.fa.fa-warning
This build was retried.
.blocks-container
.blocks-container
-
if
can?
(
current_user
,
:read_build
,
@project
)
&&
(
@build
.
artifacts?
||
@build
.
artifacts_expired?
)
-
if
can?
(
current_user
,
:read_build
,
@project
)
&&
(
@build
.
artifacts?
||
@build
.
artifacts_expired?
)
.block
{
class:
(
"block-first"
if
!
@build
.
coverage
)
}
.block
{
class:
(
"block-first"
if
!
@build
.
coverage
)
}
...
@@ -141,3 +110,35 @@
...
@@ -141,3 +110,35 @@
-
@build
.
tag_list
.
each
do
|
tag
|
-
@build
.
tag_list
.
each
do
|
tag
|
%span
.label.label-primary
%span
.label.label-primary
=
tag
=
tag
-
if
builds
.
size
>
1
.dropdown.build-dropdown
.title
Stage
%button
.dropdown-menu-toggle
{
type:
'button'
,
'data-toggle'
=>
'dropdown'
}
%span
.stage-selection
More
=
icon
(
'caret-down'
)
%ul
.dropdown-menu
-
builds
.
map
(
&
:stage
).
uniq
.
each
do
|
stage
|
%li
%a
.stage-item
=
stage
.builds-container
-
statuses
.
each
do
|
build_status
|
-
builds
.
select
{
|
build
|
build
.
status
==
build_status
}.
each
do
|
build
|
.build-job
{
class:
(
'active'
if
build
==
@build
),
data:
{
stage:
build
.
stage
}}
=
link_to
namespace_project_build_path
(
@project
.
namespace
,
@project
,
build
)
do
=
icon
(
'check'
)
=
ci_icon_for_status
(
build
.
status
)
%span
-
if
build
.
name
=
build
.
name
-
else
=
build
.
id
-
if
@build
.
retried?
%li
.active
%a
Build ##{@build.id}
·
%i
.fa.fa-warning
This build was retried.
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