Add latest changes from gitlab-org/gitlab@master

4 files changed, 9 insertions, 8 deletions

diff --git a/app/assets/javascripts/admin/abuse_reports/components/abuse_report_actions.vue b/app/assets/javascripts/admin/abuse_reports/components/abuse_report_actions.vue
index 4f3be0e3a59..5d42caa75ab 100644
--- a/app/assets/javascripts/admin/abuse_reports/components/abuse_report_actions.vue
+++ b/app/assets/javascripts/admin/abuse_reports/components/abuse_report_actions.vue
@@ -2,7 +2,7 @@
 import { GlDisclosureDropdown, GlModal } from '@gitlab/ui';
 import axios from '~/lib/utils/axios_utils';
 import { __, sprintf } from '~/locale';
-import { redirectTo, refreshCurrentPage } from '~/lib/utils/url_utility';
+import { redirectTo, refreshCurrentPage } from '~/lib/utils/url_utility'; // eslint-disable-line import/no-deprecated
 import { createAlert, VARIANT_SUCCESS } from '~/alert';
 import { ACTIONS_I18N } from '../constants';
 
@@ -126,6 +126,7 @@ export default {
         .catch(this.handleError);
     },
     handleRemoveReportResponse() {
+      // eslint-disable-next-line import/no-deprecated
       if (this.report.redirectPath) redirectTo(this.report.redirectPath);
       else refreshCurrentPage();
     },
diff --git a/app/assets/javascripts/admin/abuse_reports/components/abuse_reports_filtered_search_bar.vue b/app/assets/javascripts/admin/abuse_reports/components/abuse_reports_filtered_search_bar.vue
index e1989cadd86..b1eb5371a35 100644
--- a/app/assets/javascripts/admin/abuse_reports/components/abuse_reports_filtered_search_bar.vue
+++ b/app/assets/javascripts/admin/abuse_reports/components/abuse_reports_filtered_search_bar.vue
@@ -1,5 +1,5 @@
 <script>
-import { setUrlParams, redirectTo, queryToObject, updateHistory } from '~/lib/utils/url_utility';
+import { setUrlParams, redirectTo, queryToObject, updateHistory } from '~/lib/utils/url_utility'; // eslint-disable-line import/no-deprecated
 import { FILTERED_SEARCH_TERM } from '~/vue_shared/components/filtered_search_bar/constants';
 import FilteredSearchBar from '~/vue_shared/components/filtered_search_bar/filtered_search_bar_root.vue';
 import {
@@ -80,12 +80,12 @@ export default {
         params = { ...params, sort };
       }
 
-      redirectTo(setUrlParams(params, window.location.href, true));
+      redirectTo(setUrlParams(params, window.location.href, true)); // eslint-disable-line import/no-deprecated
     },
     handleSort(sort) {
       const { page, ...query } = queryToObject(window.location.search);
 
-      redirectTo(setUrlParams({ ...query, sort }, window.location.href, true));
+      redirectTo(setUrlParams({ ...query, sort }, window.location.href, true)); // eslint-disable-line import/no-deprecated
     },
   },
   filteredSearchNamespace: 'abuse_reports',
diff --git a/app/assets/javascripts/admin/broadcast_messages/components/base.vue b/app/assets/javascripts/admin/broadcast_messages/components/base.vue
index c28cd266617..667ab4c34f5 100644
--- a/app/assets/javascripts/admin/broadcast_messages/components/base.vue
+++ b/app/assets/javascripts/admin/broadcast_messages/components/base.vue
@@ -1,6 +1,6 @@
 <script>
 import { GlPagination } from '@gitlab/ui';
-import { redirectTo } from '~/lib/utils/url_utility';
+import { redirectTo } from '~/lib/utils/url_utility'; // eslint-disable-line import/no-deprecated
 import { buildUrlWithCurrentLocation } from '~/lib/utils/common_utils';
 import { createAlert, VARIANT_DANGER } from '~/alert';
 import { s__ } from '~/locale';
@@ -66,7 +66,7 @@ export default {
       // stranded on page 2 when deleting the last message.
       // Force a page reload to avoid this edge case.
       if (newVal === PER_PAGE && oldVal === PER_PAGE + 1) {
-        redirectTo(this.buildPageUrl(1));
+        redirectTo(this.buildPageUrl(1)); // eslint-disable-line import/no-deprecated
       }
     },
   },
diff --git a/app/assets/javascripts/admin/broadcast_messages/components/message_form.vue b/app/assets/javascripts/admin/broadcast_messages/components/message_form.vue
index 789cf77a88a..022f5df9c96 100644
--- a/app/assets/javascripts/admin/broadcast_messages/components/message_form.vue
+++ b/app/assets/javascripts/admin/broadcast_messages/components/message_form.vue
@@ -14,7 +14,7 @@ import {
 import axios from '~/lib/utils/axios_utils';
 import { s__ } from '~/locale';
 import { createAlert, VARIANT_DANGER } from '~/alert';
-import { redirectTo } from '~/lib/utils/url_utility';
+import { redirectTo } from '~/lib/utils/url_utility'; // eslint-disable-line import/no-deprecated
 import { DEFAULT_DEBOUNCE_AND_THROTTLE_MS } from '~/lib/utils/constants';
 import SafeHtml from '~/vue_shared/directives/safe_html';
 import { THEMES, TYPES, TYPE_BANNER } from '../constants';
@@ -143,7 +143,7 @@ export default {
 
       const success = await this.submitForm();
       if (success) {
-        redirectTo(this.messagesPath);
+        redirectTo(this.messagesPath); // eslint-disable-line import/no-deprecated
       } else {
         this.loading = false;
       }