Add latest changes from gitlab-org/gitlab@13-0-stable-ee

3 files changed, 6 insertions, 6 deletions

diff --git a/app/assets/javascripts/error_tracking/components/error_tracking_list.vue b/app/assets/javascripts/error_tracking/components/error_tracking_list.vue
index 3d700f4d216..45432e8ebd8 100644
--- a/app/assets/javascripts/error_tracking/components/error_tracking_list.vue
+++ b/app/assets/javascripts/error_tracking/components/error_tracking_list.vue
@@ -393,9 +393,9 @@ export default {
         <template #description>
           <div>
             <span>{{ __('Monitor your errors by integrating with Sentry.') }}</span>
-            <a href="/help/user/project/operations/error_tracking.html">
-              {{ __('More information') }}
-            </a>
+            <gl-link target="_blank" href="/help/user/project/operations/error_tracking.html">{{
+              __('More information')
+            }}</gl-link>
           </div>
         </template>
       </gl-empty-state>
diff --git a/app/assets/javascripts/error_tracking/components/stacktrace_entry.vue b/app/assets/javascripts/error_tracking/components/stacktrace_entry.vue
index 8db0b1c5da0..f7f2c450be1 100644
--- a/app/assets/javascripts/error_tracking/components/stacktrace_entry.vue
+++ b/app/assets/javascripts/error_tracking/components/stacktrace_entry.vue
@@ -1,5 +1,5 @@
 <script>
-import { escape as esc } from 'lodash';
+import { escape } from 'lodash';
 import { GlTooltip } from '@gitlab/ui';
 import { __, sprintf } from '~/locale';
 import ClipboardButton from '~/vue_shared/components/clipboard_button.vue';
@@ -62,7 +62,7 @@ export default {
         ? sprintf(
             __(`%{spanStart}in%{spanEnd} %{errorFn}`),
             {
-              errorFn: `<strong>${esc(this.errorFn)}</strong>`,
+              errorFn: `<strong>${escape(this.errorFn)}</strong>`,
               spanStart: `<span class="text-tertiary">`,
               spanEnd: `</span>`,
             },
diff --git a/app/assets/javascripts/error_tracking/store/actions.js b/app/assets/javascripts/error_tracking/store/actions.js
index 8f6f404ef8a..05554b2b566 100644
--- a/app/assets/javascripts/error_tracking/store/actions.js
+++ b/app/assets/javascripts/error_tracking/store/actions.js
@@ -1,4 +1,4 @@
-import service from './../services';
+import service from '../services';
 import * as types from './mutation_types';
 import createFlash from '~/flash';
 import { visitUrl } from '~/lib/utils/url_utility';