Add latest changes from gitlab-org/gitlab@master

3 files changed, 54 insertions, 44 deletions

diff --git a/app/assets/javascripts/pages/projects/merge_requests/diffs/index.js b/app/assets/javascripts/pages/projects/merge_requests/diffs/index.js
new file mode 100644
index 00000000000..77294c0fb9e
--- /dev/null
+++ b/app/assets/javascripts/pages/projects/merge_requests/diffs/index.js
@@ -0,0 +1,5 @@
+import initDiffsApp from '~/diffs';
+import { initMrPage } from '../page';
+
+initMrPage();
+initDiffsApp();
diff --git a/app/assets/javascripts/pages/projects/merge_requests/page.js b/app/assets/javascripts/pages/projects/merge_requests/page.js
new file mode 100644
index 00000000000..a8699b350f8
--- /dev/null
+++ b/app/assets/javascripts/pages/projects/merge_requests/page.js
@@ -0,0 +1,45 @@
+import Vue from 'vue';
+import StickyHeader from '~/merge_requests/components/sticky_header.vue';
+import { initIssuableHeaderWarnings } from '~/issuable';
+import initMrNotes from '~/mr_notes';
+import store from '~/mr_notes/stores';
+import initSidebarBundle from '~/sidebar/sidebar_bundle';
+import { apolloProvider } from '~/graphql_shared/issuable_client';
+import { parseBoolean } from '~/lib/utils/common_utils';
+import initShow from './init_merge_request_show';
+import getStateQuery from './queries/get_state.query.graphql';
+
+export function initMrPage() {
+  initMrNotes();
+  initShow();
+}
+
+requestIdleCallback(() => {
+  initSidebarBundle(store);
+  initIssuableHeaderWarnings(store);
+
+  const el = document.getElementById('js-merge-sticky-header');
+
+  if (el) {
+    const { data } = el.dataset;
+    const { iid, projectPath, title, tabs, isFluidLayout } = JSON.parse(data);
+
+    // eslint-disable-next-line no-new
+    new Vue({
+      el,
+      store,
+      apolloProvider,
+      provide: {
+        query: getStateQuery,
+        iid,
+        projectPath,
+        title,
+        tabs,
+        isFluidLayout: parseBoolean(isFluidLayout),
+      },
+      render(h) {
+        return h(StickyHeader);
+      },
+    });
+  }
+});
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 cc5c393ff8c..568bf19b55e 100644
--- a/app/assets/javascripts/pages/projects/merge_requests/show/index.js
+++ b/app/assets/javascripts/pages/projects/merge_requests/show/index.js
@@ -1,45 +1,5 @@
-import Vue from 'vue';
-import StickyHeader from '~/merge_requests/components/sticky_header.vue';
-import { initReviewBar } from '~/batch_comments';
-import { initIssuableHeaderWarnings } from '~/issuable';
-import initMrNotes from '~/mr_notes';
-import store from '~/mr_notes/stores';
-import initSidebarBundle from '~/sidebar/sidebar_bundle';
-import { apolloProvider } from '~/graphql_shared/issuable_client';
-import { parseBoolean } from '~/lib/utils/common_utils';
-import initShow from '../init_merge_request_show';
-import getStateQuery from '../queries/get_state.query.graphql';
+import initNotesApp from '~/mr_notes/init_notes';
+import { initMrPage } from '../page';
 
-initMrNotes();
-initShow();
-
-requestIdleCallback(() => {
-  initSidebarBundle(store);
-  initReviewBar();
-  initIssuableHeaderWarnings(store);
-
-  const el = document.getElementById('js-merge-sticky-header');
-
-  if (el) {
-    const { data } = el.dataset;
-    const { iid, projectPath, title, tabs, isFluidLayout } = JSON.parse(data);
-
-    // eslint-disable-next-line no-new
-    new Vue({
-      el,
-      store,
-      apolloProvider,
-      provide: {
-        query: getStateQuery,
-        iid,
-        projectPath,
-        title,
-        tabs,
-        isFluidLayout: parseBoolean(isFluidLayout),
-      },
-      render(h) {
-        return h(StickyHeader);
-      },
-    });
-  }
-});
+initMrPage();
+initNotesApp();