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
7644edd8
Commit
7644edd8
authored
May 30, 2018
by
Jose
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add partial for the build outputs
parent
43e08b1a
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
8 additions
and
8 deletions
+8
-8
app/assets/javascripts/job.js
app/assets/javascripts/job.js
+0
-4
app/assets/javascripts/lib/utils/scroll_utils.js
app/assets/javascripts/lib/utils/scroll_utils.js
+3
-0
app/views/projects/jobs/show.html.haml
app/views/projects/jobs/show.html.haml
+1
-3
app/views/shared/builds/_build_output.html.haml
app/views/shared/builds/_build_output.html.haml
+3
-0
qa/qa/page/project/job/show.rb
qa/qa/page/project/job/show.rb
+1
-1
No files found.
app/assets/javascripts/job.js
View file @
7644edd8
...
@@ -32,10 +32,6 @@ export default class Job extends LogOutputBehaviours {
...
@@ -32,10 +32,6 @@ export default class Job extends LogOutputBehaviours {
this
.
$buildTraceOutput
=
$
(
'
.js-build-output
'
);
this
.
$buildTraceOutput
=
$
(
'
.js-build-output
'
);
this
.
$topBar
=
$
(
'
.js-top-bar
'
);
this
.
$topBar
=
$
(
'
.js-top-bar
'
);
// Scroll controllers
this
.
$scrollTopBtn
=
$
(
'
.js-scroll-up
'
);
this
.
$scrollBottomBtn
=
$
(
'
.js-scroll-down
'
);
clearTimeout
(
this
.
timeout
);
clearTimeout
(
this
.
timeout
);
this
.
initSidebar
();
this
.
initSidebar
();
...
...
app/assets/javascripts/lib/utils/scroll_utils.js
View file @
7644edd8
...
@@ -2,6 +2,9 @@ import $ from 'jquery';
...
@@ -2,6 +2,9 @@ import $ from 'jquery';
export
const
canScroll
=
()
=>
$
(
document
).
height
()
>
$
(
window
).
height
();
export
const
canScroll
=
()
=>
$
(
document
).
height
()
>
$
(
window
).
height
();
/**
* Checks if the entire page is scrolled down all the way to the bottom
*/
export
const
isScrolledToBottom
=
()
=>
{
export
const
isScrolledToBottom
=
()
=>
{
const
$document
=
$
(
document
);
const
$document
=
$
(
document
);
...
...
app/views/projects/jobs/show.html.haml
View file @
7644edd8
...
@@ -86,9 +86,7 @@
...
@@ -86,9 +86,7 @@
%button
.js-scroll-down.btn-scroll.btn-transparent.btn-blank
{
type:
'button'
,
disabled:
true
}
%button
.js-scroll-down.btn-scroll.btn-transparent.btn-blank
{
type:
'button'
,
disabled:
true
}
=
custom_icon
(
'scroll_down'
)
=
custom_icon
(
'scroll_down'
)
%pre
.build-trace
#build-trace
=
render
'shared/builds/build_output'
%code
.bash.js-build-output
.build-loader-animation.js-build-refresh
-
else
-
else
=
render
"empty_states"
=
render
"empty_states"
...
...
app/views/shared/builds/_build_output.html.haml
0 → 100644
View file @
7644edd8
%pre
.build-trace
#build-trace
%code
.bash.js-build-output
.build-loader-animation.js-build-refresh
qa/qa/page/project/job/show.rb
View file @
7644edd8
...
@@ -4,7 +4,7 @@ module QA::Page
...
@@ -4,7 +4,7 @@ module QA::Page
COMPLETED_STATUSES
=
%w[passed failed canceled blocked skipped manual]
.
freeze
# excludes created, pending, running
COMPLETED_STATUSES
=
%w[passed failed canceled blocked skipped manual]
.
freeze
# excludes created, pending, running
PASSED_STATUS
=
'passed'
.
freeze
PASSED_STATUS
=
'passed'
.
freeze
view
'app/views/
projects/jobs/show
.html.haml'
do
view
'app/views/
shared/builds/_build_output
.html.haml'
do
element
:build_output
,
'.js-build-output'
element
:build_output
,
'.js-build-output'
end
end
...
...
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