diff options
author | Phil Hughes <me@iamphill.com> | 2018-02-27 10:02:49 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2018-02-27 10:02:49 +0000 |
commit | d01252024ae75fb60f9e1dd51e85519649736e80 (patch) | |
tree | d331f20c9745c321de51fa3608c664ddd0c7791c /app/assets/javascripts/pages/projects/merge_requests | |
parent | 6358004b1c64ed3f8b83a75a672a0a72e1bee851 (diff) | |
parent | a4885b8f37602c399efff028b0a733ef80fbe7ab (diff) | |
download | gitlab-ce-d01252024ae75fb60f9e1dd51e85519649736e80.tar.gz |
Merge branch 'master' into 'ph-webpack-bundle-tags'ph-webpack-bundle-tags
# Conflicts:
# app/assets/javascripts/pages/projects/merge_requests/show/index.js
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 bd0f4fe5188..16522d06eb2 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'; import initWidget from '../../../../vue_merge_request_widget'; document.addEventListener('DOMContentLoaded', () => { @@ -16,6 +17,7 @@ document.addEventListener('DOMContentLoaded', () => { initIssuableSidebar(); initNotes(); initDiffNotes(); + initPipelines(); const mrShowNode = document.querySelector('.merge-request'); |