Add latest changes from gitlab-org/gitlab@master

2 files changed, 28 insertions, 24 deletions

diff --git a/app/assets/javascripts/error_tracking/details.js b/app/assets/javascripts/error_tracking/details.js
index 1a92681374b..55ab362f805 100644
--- a/app/assets/javascripts/error_tracking/details.js
+++ b/app/assets/javascripts/error_tracking/details.js
@@ -8,28 +8,30 @@ import csrf from '~/lib/utils/csrf';
 Vue.use(VueApollo);
 
 export default () => {
+  const selector = '#js-error_details';
+
+  const domEl = document.querySelector(selector);
+  const {
+    issueId,
+    projectPath,
+    issueUpdatePath,
+    issueStackTracePath,
+    projectIssuesPath,
+  } = domEl.dataset;
+
   const apolloProvider = new VueApollo({
     defaultClient: createDefaultClient(),
   });
 
   // eslint-disable-next-line no-new
   new Vue({
-    el: '#js-error_details',
+    el: selector,
     apolloProvider,
     components: {
       ErrorDetails,
     },
     store,
     render(createElement) {
-      const domEl = document.querySelector(this.$options.el);
-      const {
-        issueId,
-        projectPath,
-        issueUpdatePath,
-        issueStackTracePath,
-        projectIssuesPath,
-      } = domEl.dataset;
-
       return createElement('error-details', {
         props: {
           issueId,
diff --git a/app/assets/javascripts/error_tracking/list.js b/app/assets/javascripts/error_tracking/list.js
index 8f3700249da..cb656a9ef13 100644
--- a/app/assets/javascripts/error_tracking/list.js
+++ b/app/assets/javascripts/error_tracking/list.js
@@ -4,27 +4,29 @@ import store from './store';
 import ErrorTrackingList from './components/error_tracking_list.vue';
 
 export default () => {
+  const selector = '#js-error_tracking';
+
+  const domEl = document.querySelector(selector);
+  const {
+    indexPath,
+    enableErrorTrackingLink,
+    illustrationPath,
+    projectPath,
+    listPath,
+  } = domEl.dataset;
+  let { errorTrackingEnabled, userCanEnableErrorTracking } = domEl.dataset;
+
+  errorTrackingEnabled = parseBoolean(errorTrackingEnabled);
+  userCanEnableErrorTracking = parseBoolean(userCanEnableErrorTracking);
+
   // eslint-disable-next-line no-new
   new Vue({
-    el: '#js-error_tracking',
+    el: selector,
     components: {
       ErrorTrackingList,
     },
     store,
     render(createElement) {
-      const domEl = document.querySelector(this.$options.el);
-      const {
-        indexPath,
-        enableErrorTrackingLink,
-        illustrationPath,
-        projectPath,
-        listPath,
-      } = domEl.dataset;
-      let { errorTrackingEnabled, userCanEnableErrorTracking } = domEl.dataset;
-
-      errorTrackingEnabled = parseBoolean(errorTrackingEnabled);
-      userCanEnableErrorTracking = parseBoolean(userCanEnableErrorTracking);
-
       return createElement('error-tracking-list', {
         props: {
           indexPath,