Merge branch '23325-pipeline-graph-hidden' into 'master'

Fix pipeline graph hidden on commit and mr pages ## What does this MR do? Dynamically invokes `new gl.Pipelines();` when an MR `builds` tab is clicked. Dispatches `new gl.Pipelines();` on a `commit#builds` page. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? The pipeline graph was hidden on commit and mr pages ## Screenshots (if relevant) Commit page: ![Screen_Shot_2016-10-14_at_18.16.18](/uploads/ee11dea0825d1489dc167292e16c8f41/Screen_Shot_2016-10-14_at_18.16.18.png) MR: ![Screen_Shot_2016-10-14_at_18.16.39](/uploads/602c2fce2397c799bedb757bfd3010af/Screen_Shot_2016-10-14_at_18.16.39.png) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #23325 See merge request !6895

Merge branch '23325-pipeline-graph-hidden' into 'master'
c99d12e5 · Alfredo Sumaran · 8d703a44 · 3ea3a6a1 · c99d12e5 · c99d12e5
Commit c99d12e5 authored Oct 24, 2016 by Alfredo Sumaran
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

CHANGELOG.md CHANGELOG.md +1 -0

dispatcher.js.es6 app/assets/javascripts/dispatcher.js.es6 +3 -0

merge_request_tabs.js app/assets/javascripts/merge_request_tabs.js +1 -0

No files found.
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,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 

--- 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();

--- 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)