diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-12-26 18:58:34 +0000 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2016-12-27 16:58:55 +0000 |
| commit | 0aeefcef14e459aea7d42f7aba1e7933536ee235 (patch) | |
| tree | c0f657f9ea8dcb233995c2ba4f599f0c843d6785 | |
| parent | f52d272e2542b70173726482ba190a5861c42796 (diff) | |
| download | gitlab-ce-0aeefcef14e459aea7d42f7aba1e7933536ee235.tar.gz | |
Merge branch '26040-hide-scroll-top' into 'master'
Hide Scroll Top button for failed Build page
Closes #26040
See merge request !8295
| -rw-r--r-- | app/assets/javascripts/build.js | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/26040-hide-scroll-top.yml | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/app/assets/javascripts/build.js b/app/assets/javascripts/build.js index 5e449170cd3..bc13c46443a 100644 --- a/app/assets/javascripts/build.js +++ b/app/assets/javascripts/build.js @@ -92,8 +92,8 @@ success: function(buildData) { $('.js-build-output').html(buildData.trace_html); if (removeRefreshStatuses.indexOf(buildData.status) >= 0) { - this.initScrollMonitor(); - return this.$buildRefreshAnimation.remove(); + this.$buildRefreshAnimation.remove(); + return this.initScrollMonitor(); } }.bind(this) }); diff --git a/changelogs/unreleased/26040-hide-scroll-top.yml b/changelogs/unreleased/26040-hide-scroll-top.yml new file mode 100644 index 00000000000..f68cb1dd51d --- /dev/null +++ b/changelogs/unreleased/26040-hide-scroll-top.yml @@ -0,0 +1,4 @@ +--- +title: Hide Scroll Top button for failed build page +merge_request: 8295 +author: |