diff options
| author | Luke Bennett <lukeeeebennettplus@gmail.com> | 2016-10-14 18:05:48 +0100 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-10-24 13:20:37 -0500 |
| commit | 3ea3a6a152c88325ca2fd1161a27b4a9e2d5ce51 (patch) | |
| tree | 359848d75e3f45a13085a0693de73e3c71ccfcbc | |
| parent | cb38290ababe43aca0c635fb87d3a38c4c5debcd (diff) | |
| download | gitlab-ce-3ea3a6a152c88325ca2fd1161a27b4a9e2d5ce51.tar.gz | |
invoked the pipelines class when builds are dynamically loaded and dispatched for commit builds page
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/dispatcher.js.es6 | 3 | ||||
| -rw-r--r-- | app/assets/javascripts/merge_request_tabs.js | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 0f02cc1f102..51b0adcde1b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ Please view this file on the master branch, on stable branches it's out of date. ## 8.13.1 (unreleased) - Fix error in generating labels - Fix reply-by-email not working due to queue name mismatch + - Fixed hidden pipeline graph on commit and MR page !6895 - Expire and build repository cache after project import - Fix 404 for group pages when GitLab setup uses relative url - Simpler arguments passed to named_route on toggle_award_url helper method diff --git a/app/assets/javascripts/dispatcher.js.es6 b/app/assets/javascripts/dispatcher.js.es6 index afc0d6f8c62..a1fe57562fa 100644 --- a/app/assets/javascripts/dispatcher.js.es6 +++ b/app/assets/javascripts/dispatcher.js.es6 @@ -117,6 +117,9 @@ new ZenMode(); shortcut_handler = new ShortcutsNavigation(); break; + case 'projects:commit:builds': + new gl.Pipelines(); + break; case 'projects:commits:show': case 'projects:activity': shortcut_handler = new ShortcutsNavigation(); diff --git a/app/assets/javascripts/merge_request_tabs.js b/app/assets/javascripts/merge_request_tabs.js index 9f28738e06b..3dde979185b 100644 --- a/app/assets/javascripts/merge_request_tabs.js +++ b/app/assets/javascripts/merge_request_tabs.js @@ -282,6 +282,7 @@ document.querySelector("div#builds").innerHTML = data.html; gl.utils.localTimeAgo($('.js-timeago', 'div#builds')); _this.buildsLoaded = true; + if (!this.pipelines) this.pipelines = new gl.Pipelines(); return _this.scrollToElement("#builds"); }; })(this) |