diff options
author | Phil Hughes <me@iamphill.com> | 2018-02-27 09:58:09 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2018-02-27 09:58:09 +0000 |
commit | a4885b8f37602c399efff028b0a733ef80fbe7ab (patch) | |
tree | 0b39bd32ab850cee7f9a36f92f575578c3e33e7c /app/assets/javascripts/pages/projects/merge_requests | |
parent | 5a507c82311b8283e2dcaecaaaffa6d5db9662e6 (diff) | |
parent | c737646d1291d9aa5beb1e589711e1c0f17b70f3 (diff) | |
download | gitlab-ce-a4885b8f37602c399efff028b0a733ef80fbe7ab.tar.gz |
Merge branch 'refactor-pipelines-list' into 'master'
Remove commit_pipelines webpack entry point
See merge request gitlab-org/gitlab-ce!17379
Diffstat (limited to 'app/assets/javascripts/pages/projects/merge_requests')
-rw-r--r-- | app/assets/javascripts/pages/projects/merge_requests/creations/new/index.js | 2 | ||||
-rw-r--r-- | app/assets/javascripts/pages/projects/merge_requests/show/index.js | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/app/assets/javascripts/pages/projects/merge_requests/creations/new/index.js b/app/assets/javascripts/pages/projects/merge_requests/creations/new/index.js index 1d5aec4001d..6c9afddefac 100644 --- a/app/assets/javascripts/pages/projects/merge_requests/creations/new/index.js +++ b/app/assets/javascripts/pages/projects/merge_requests/creations/new/index.js @@ -1,5 +1,6 @@ import Compare from '~/compare'; import MergeRequest from '~/merge_request'; +import initPipelines from '~/commit/pipelines/pipelines_bundle'; document.addEventListener('DOMContentLoaded', () => { const mrNewCompareNode = document.querySelector('.js-merge-request-new-compare'); @@ -14,5 +15,6 @@ document.addEventListener('DOMContentLoaded', () => { new MergeRequest({ // eslint-disable-line no-new action: mrNewSubmitNode.dataset.mrSubmitAction, }); + initPipelines(); } }); diff --git a/app/assets/javascripts/pages/projects/merge_requests/show/index.js b/app/assets/javascripts/pages/projects/merge_requests/show/index.js index 07f3e579c97..322d02f93db 100644 --- a/app/assets/javascripts/pages/projects/merge_requests/show/index.js +++ b/app/assets/javascripts/pages/projects/merge_requests/show/index.js @@ -7,6 +7,7 @@ import ShortcutsIssuable from '~/shortcuts_issuable'; import Diff from '~/diff'; import { handleLocationHash } from '~/lib/utils/common_utils'; import howToMerge from '~/how_to_merge'; +import initPipelines from '~/commit/pipelines/pipelines_bundle'; document.addEventListener('DOMContentLoaded', () => { new Diff(); // eslint-disable-line no-new @@ -15,6 +16,7 @@ document.addEventListener('DOMContentLoaded', () => { initIssuableSidebar(); initNotes(); initDiffNotes(); + initPipelines(); const mrShowNode = document.querySelector('.merge-request'); |