Add latest changes from gitlab-org/gitlab@master

2 files changed, 16 insertions, 2 deletions

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 bd4f2960269..8726cd2f6fa 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
@@ -19,9 +19,13 @@ export default {
     return {
       initialFilterValue: [],
       initialSortBy: DEFAULT_SORT,
-      tokens: [...FILTERED_SEARCH_TOKENS, buildFilteredSearchCategoryToken(this.categories)],
     };
   },
+  computed: {
+    tokens() {
+      return [...FILTERED_SEARCH_TOKENS, buildFilteredSearchCategoryToken(this.categories)];
+    },
+  },
   created() {
     const query = queryToObject(window.location.search);
 
diff --git a/app/assets/javascripts/admin/abuse_reports/constants.js b/app/assets/javascripts/admin/abuse_reports/constants.js
index 2db107923f6..ee2e9ab2cbf 100644
--- a/app/assets/javascripts/admin/abuse_reports/constants.js
+++ b/app/assets/javascripts/admin/abuse_reports/constants.js
@@ -23,6 +23,12 @@ export const FILTERED_SEARCH_TOKEN_USER = {
   defaultUsers: [],
 };
 
+export const FILTERED_SEARCH_TOKEN_REPORTER = {
+  ...FILTERED_SEARCH_TOKEN_USER,
+  type: 'reporter',
+  title: __('Reporter'),
+};
+
 export const FILTERED_SEARCH_TOKEN_STATUS = {
   type: 'status',
   icon: 'status',
@@ -68,4 +74,8 @@ export const FILTERED_SEARCH_TOKEN_CATEGORY = {
   operators: OPERATORS_IS,
 };
 
-export const FILTERED_SEARCH_TOKENS = [FILTERED_SEARCH_TOKEN_USER, FILTERED_SEARCH_TOKEN_STATUS];
+export const FILTERED_SEARCH_TOKENS = [
+  FILTERED_SEARCH_TOKEN_USER,
+  FILTERED_SEARCH_TOKEN_REPORTER,
+  FILTERED_SEARCH_TOKEN_STATUS,
+];