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
8d7d6bcb
Commit
8d7d6bcb
authored
Dec 06, 2016
by
Kushal Pandya
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix rebase conflicts
parent
407c90be
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
19 deletions
+0
-19
app/assets/javascripts/build.js
app/assets/javascripts/build.js
+0
-19
No files found.
app/assets/javascripts/build.js
View file @
8d7d6bcb
...
@@ -179,7 +179,6 @@
...
@@ -179,7 +179,6 @@
if
(
$autoScrollContainer
.
length
)
{
// Show and Reposition Autoscroll Status Message
if
(
$autoScrollContainer
.
length
)
{
// Show and Reposition Autoscroll Status Message
$autoScrollContainer
.
show
().
css
({
top
:
$body
.
outerHeight
()
-
75
});
$autoScrollContainer
.
show
().
css
({
top
:
$body
.
outerHeight
()
-
75
});
<<<<<<<
fbd5f4507b310d6dc1305696851e9860b48fa0ba
}
}
}
}
...
@@ -196,24 +195,6 @@
...
@@ -196,24 +195,6 @@
// Check if Refresh Animation is in Viewport and enable Autoscroll, disable otherwise.
// Check if Refresh Animation is in Viewport and enable Autoscroll, disable otherwise.
$autoScrollStatus
.
data
(
"
state
"
,
isInViewport
(
$
(
'
.js-build-refresh
'
))
?
'
enabled
'
:
'
disabled
'
);
$autoScrollStatus
.
data
(
"
state
"
,
isInViewport
(
$
(
'
.js-build-refresh
'
))
?
'
enabled
'
:
'
disabled
'
);
}
}
=======
}
}
if
(
!
isInViewport
(
$upBuildTrace
)
&&
!
isInViewport
(
$downBuildTrace
))
{
// User is somewhere in middle of Build Log
$scrollTopBtn
.
show
().
addClass
(
'
sticky
'
);
$scrollBottomBtn
.
show
().
addClass
(
'
sticky
'
);
if
(
$autoScrollContainer
.
length
)
{
$autoScrollContainer
.
hide
();
}
}
if
(
this
.
buildStatus
===
"
running
"
||
this
.
buildStatus
===
"
pending
"
)
{
// Check if Refresh Animation is in Viewport and enable Autoscroll, disable otherwise.
$autoScrollStatus
.
data
(
"
state
"
,
isInViewport
(
$
(
'
.js-build-refresh
'
))
?
'
enabled
'
:
'
disabled
'
);
}
>>>>>>>
Improve
isInViewport
impl
,
autoscroll
behavior
};
};
Build
.
prototype
.
shouldHideSidebarForViewport
=
function
()
{
Build
.
prototype
.
shouldHideSidebarForViewport
=
function
()
{
...
...
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