root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Fix rebase conflicts

This commit is contained in:
Kushal Pandya 2016-12-06 15:04:42 +05:30
parent 407c90bebf
commit 8d7d6bcbd0
1 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/assets/javascripts/build.js
View File

@ -179,7 +179,6 @@
if ($autoScrollContainer.length) { // Show and Reposition Autoscroll Status Message
$autoScrollContainer.show().css({ top: $body.outerHeight() - 75 });
<<<<<<< fbd5f4507b310d6dc1305696851e9860b48fa0ba
}
}
@ -196,24 +195,6 @@
// Check if Refresh Animation is in Viewport and enable Autoscroll, disable otherwise.
$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() {