diff options
| author | Luke Bennett <lukeeeebennettplus@gmail.com> | 2016-10-14 18:05:48 +0100 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-10-24 10:46:30 -0500 |
| commit | 8c9a155f7264f66b173ccf467277b6542d93472e (patch) | |
| tree | fac9587d0447ce5119f9746d09a2abfcfc1cf453 | |
| parent | 60eca5f7b5e38c09c8170682852c497c410a96ac (diff) | |
| download | gitlab-ce-23325-pipeline-graph-hidden.tar.gz | |
invoked the pipelines class when builds are dynamically loaded and dispatched for commit builds page23325-pipeline-graph-hidden
| -rw-r--r-- | CHANGELOG.md | 4 | ||||
| -rw-r--r-- | app/assets/javascripts/dispatcher.js.es6 | 3 | ||||
| -rw-r--r-- | app/assets/javascripts/merge_request_tabs.js | 1 |
3 files changed, 8 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 73dc323e02c..055a4cb50a1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,10 @@ Please view this file on the master branch, on stable branches it's out of date. - Fix HipChat notifications rendering (airatshigapov, eisnerd) - Simpler arguments passed to named_route on toggle_award_url helper method +## 8.13.1 + + - Fixed hidden pipeline graph on commit and MR page !6895 + ## 8.13.0 (2016-10-22) - Fix save button on project pipeline settings page. (!6955) 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 fd21aa1fefa..03ce2dd283a 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) |