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
Léo-Paul Géneau
gitlab-ce
Commits
283c1dc3
Commit
283c1dc3
authored
Aug 01, 2016
by
Annabel Dunstone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add overflow tests to dropdown
parent
8e4ec561
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
11 deletions
+18
-11
app/assets/javascripts/build.js
app/assets/javascripts/build.js
+11
-0
app/views/projects/builds/show.html.haml
app/views/projects/builds/show.html.haml
+7
-11
No files found.
app/assets/javascripts/build.js
View file @
283c1dc3
...
@@ -20,6 +20,7 @@
...
@@ -20,6 +20,7 @@
$
(
document
).
off
(
'
click
'
,
'
.js-sidebar-build-toggle
'
).
on
(
'
click
'
,
'
.js-sidebar-build-toggle
'
,
this
.
toggleSidebar
);
$
(
document
).
off
(
'
click
'
,
'
.js-sidebar-build-toggle
'
).
on
(
'
click
'
,
'
.js-sidebar-build-toggle
'
,
this
.
toggleSidebar
);
$
(
window
).
off
(
'
resize.build
'
).
on
(
'
resize.build
'
,
this
.
hideSidebar
);
$
(
window
).
off
(
'
resize.build
'
).
on
(
'
resize.build
'
,
this
.
hideSidebar
);
this
.
updateArtifactRemoveDate
();
this
.
updateArtifactRemoveDate
();
this
.
displayTestStatuses
();
if
(
$
(
'
#build-trace
'
).
length
)
{
if
(
$
(
'
#build-trace
'
).
length
)
{
this
.
getInitialBuildTrace
();
this
.
getInitialBuildTrace
();
this
.
initScrollButtonAffix
();
this
.
initScrollButtonAffix
();
...
@@ -132,6 +133,16 @@
...
@@ -132,6 +133,16 @@
}
}
};
};
Build
.
prototype
.
displayTestStatuses
=
function
()
{
$jobTopPosition
=
$
(
'
.build-job
'
).
first
().
offset
().
top
;
$
(
'
.build-job
'
).
each
(
function
()
{
if
(
$
(
this
).
offset
().
top
>
$jobTopPosition
)
{
$
(
'
.overflow-jobs > li
'
).
append
(
$
(
this
));
}
})
};
return
Build
;
return
Build
;
})();
})();
...
...
app/views/projects/builds/show.html.haml
View file @
283c1dc3
...
@@ -12,23 +12,19 @@
...
@@ -12,23 +12,19 @@
-
statuses
.
each
do
|
build_status
|
-
statuses
.
each
do
|
build_status
|
-
builds
.
select
{
|
build
|
build
.
status
==
build_status
}.
each
do
|
build
|
-
builds
.
select
{
|
build
|
build
.
status
==
build_status
}.
each
do
|
build
|
%li
{
class:
(
'active'
if
build
==
@build
)
}
%li
{
class:
(
'active'
if
build
==
@build
)
}
=
link_to
namespace_project_build_path
(
@project
.
namespace
,
@project
,
build
)
do
=
link_to
namespace_project_build_path
(
@project
.
namespace
,
@project
,
build
),
class:
'build-job'
do
=
ci_icon_for_status
(
build
.
status
)
%span
-
if
build
.
name
=
build
.
name
-
else
=
build
.
id
-
builds
.
select
{
|
build
|
build
.
status
==
"success"
}.
each
do
|
build
|
%li
{
class:
(
'active'
if
build
==
@build
)
}
=
link_to
namespace_project_build_path
(
@project
.
namespace
,
@project
,
build
)
do
=
ci_icon_for_status
(
build
.
status
)
=
ci_icon_for_status
(
build
.
status
)
%span
%span
-
if
build
.
name
-
if
build
.
name
=
build
.
name
=
build
.
name
-
else
-
else
=
build
.
id
=
build
.
id
.dropdown
%button
.dropdown-menu-toggle
{
type:
'button'
,
'data-toggle'
=>
'dropdown'
}
%span
Test Name
=
icon
(
'chevron-down'
)
%ul
.dropdown-menu.overflow-jobs
%li
-
if
@build
.
retried?
-
if
@build
.
retried?
%li
.active
%li
.active
...
...
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