summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/pages/projects/merge_requests
diff options
context:
space:
mode:
authorClement Ho <ClemMakesApps@gmail.com>2018-02-19 10:20:31 -0600
committerClement Ho <ClemMakesApps@gmail.com>2018-02-19 10:20:31 -0600
commit3b17bba14cbaa0080b806bbfd208feeeecfd4491 (patch)
tree406b5520dd003d2458358f9de674dd0510734227 /app/assets/javascripts/pages/projects/merge_requests
parentda521875a075435a2bf11151b5521303e09c7f33 (diff)
parentfb2a76ac484f5bba305abdf7b54a18ee8133f63f (diff)
downloadgitlab-ce-3b17bba14cbaa0080b806bbfd208feeeecfd4491.tar.gz
Merge branch 'master' into dispatcher-mr-haml
Diffstat (limited to 'app/assets/javascripts/pages/projects/merge_requests')
-rw-r--r--app/assets/javascripts/pages/projects/merge_requests/creations/index.js (renamed from app/assets/javascripts/pages/projects/merge_requests/creations/diffs/index.js)2
-rw-r--r--app/assets/javascripts/pages/projects/merge_requests/creations/new/index.js4
-rw-r--r--app/assets/javascripts/pages/projects/merge_requests/edit/index.js2
3 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/javascripts/pages/projects/merge_requests/creations/diffs/index.js b/app/assets/javascripts/pages/projects/merge_requests/creations/index.js
index 734d01ae6f2..febfecebbd2 100644
--- a/app/assets/javascripts/pages/projects/merge_requests/creations/diffs/index.js
+++ b/app/assets/javascripts/pages/projects/merge_requests/creations/index.js
@@ -1,3 +1,3 @@
import initMergeRequest from '~/pages/projects/merge_requests/init_merge_request';
-export default initMergeRequest;
+document.addEventListener('DOMContentLoaded', initMergeRequest);
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 ccd0b54c5ed..1d5aec4001d 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,7 +1,7 @@
import Compare from '~/compare';
import MergeRequest from '~/merge_request';
-export default () => {
+document.addEventListener('DOMContentLoaded', () => {
const mrNewCompareNode = document.querySelector('.js-merge-request-new-compare');
if (mrNewCompareNode) {
new Compare({ // eslint-disable-line no-new
@@ -15,4 +15,4 @@ export default () => {
action: mrNewSubmitNode.dataset.mrSubmitAction,
});
}
-};
+});
diff --git a/app/assets/javascripts/pages/projects/merge_requests/edit/index.js b/app/assets/javascripts/pages/projects/merge_requests/edit/index.js
index 734d01ae6f2..febfecebbd2 100644
--- a/app/assets/javascripts/pages/projects/merge_requests/edit/index.js
+++ b/app/assets/javascripts/pages/projects/merge_requests/edit/index.js
@@ -1,3 +1,3 @@
import initMergeRequest from '~/pages/projects/merge_requests/init_merge_request';
-export default initMergeRequest;
+document.addEventListener('DOMContentLoaded', initMergeRequest);