Add latest changes from gitlab-org/gitlab@master

3 files changed, 20 insertions, 20 deletions

diff --git a/app/assets/javascripts/issues/list/components/issues_list_app.vue b/app/assets/javascripts/issues/list/components/issues_list_app.vue
index 64de4b1947b..241b654df5c 100644
--- a/app/assets/javascripts/issues/list/components/issues_list_app.vue
+++ b/app/assets/javascripts/issues/list/components/issues_list_app.vue
@@ -28,7 +28,7 @@ import { helpPagePath } from '~/helpers/help_page_helper';
 import {
   DEFAULT_NONE_ANY,
   FILTERED_SEARCH_TERM,
-  OPERATOR_IS_ONLY,
+  OPERATORS_IS,
   TOKEN_TITLE_ASSIGNEE,
   TOKEN_TITLE_AUTHOR,
   TOKEN_TITLE_CONFIDENTIAL,
@@ -39,8 +39,8 @@ import {
   TOKEN_TITLE_ORGANIZATION,
   TOKEN_TITLE_RELEASE,
   TOKEN_TITLE_TYPE,
-  OPERATOR_IS_NOT_OR,
-  OPERATOR_IS_AND_IS_NOT,
+  OPERATORS_IS_NOT_OR,
+  OPERATORS_IS_NOT,
   TOKEN_TYPE_ASSIGNEE,
   TOKEN_TYPE_AUTHOR,
   TOKEN_TYPE_CONFIDENTIAL,
@@ -318,7 +318,7 @@ export default {
           token: AuthorToken,
           dataType: 'user',
           defaultAuthors: DEFAULT_NONE_ANY,
-          operators: this.hasOrFeature ? OPERATOR_IS_NOT_OR : OPERATOR_IS_AND_IS_NOT,
+          operators: this.hasOrFeature ? OPERATORS_IS_NOT_OR : OPERATORS_IS_NOT,
           fetchAuthors: this.fetchUsers,
           recentSuggestionsStorageKey: `${this.fullPath}-issues-recent-tokens-assignee`,
           preloadedAuthors,
@@ -378,7 +378,7 @@ export default {
           icon: 'eye-slash',
           token: GlFilteredSearchToken,
           unique: true,
-          operators: OPERATOR_IS_ONLY,
+          operators: OPERATORS_IS,
           options: [
             { icon: 'eye-slash', value: 'yes', title: this.$options.i18n.confidentialYes },
             { icon: 'eye', value: 'no', title: this.$options.i18n.confidentialNo },
@@ -396,7 +396,7 @@ export default {
           isProject: this.isProject,
           defaultContacts: DEFAULT_NONE_ANY,
           recentSuggestionsStorageKey: `${this.fullPath}-issues-recent-tokens-crm-contacts`,
-          operators: OPERATOR_IS_ONLY,
+          operators: OPERATORS_IS,
           unique: true,
         });
       }
@@ -411,7 +411,7 @@ export default {
           isProject: this.isProject,
           defaultOrganizations: DEFAULT_NONE_ANY,
           recentSuggestionsStorageKey: `${this.fullPath}-issues-recent-tokens-crm-organizations`,
-          operators: OPERATOR_IS_ONLY,
+          operators: OPERATORS_IS,
           unique: true,
         });
       }
diff --git a/app/assets/javascripts/issues/list/constants.js b/app/assets/javascripts/issues/list/constants.js
index 5ed9ceea856..01aa9fd9009 100644
--- a/app/assets/javascripts/issues/list/constants.js
+++ b/app/assets/javascripts/issues/list/constants.js
@@ -6,7 +6,7 @@ import {
   FILTER_STARTED,
   FILTER_UPCOMING,
   OPERATOR_IS,
-  OPERATOR_IS_NOT,
+  OPERATOR_NOT,
   OPERATOR_OR,
   TOKEN_TYPE_ASSIGNEE,
   TOKEN_TYPE_AUTHOR,
@@ -174,7 +174,7 @@ export const filters = {
       [OPERATOR_IS]: {
         [NORMAL_FILTER]: 'author_username',
       },
-      [OPERATOR_IS_NOT]: {
+      [OPERATOR_NOT]: {
         [NORMAL_FILTER]: 'not[author_username]',
       },
     },
@@ -190,7 +190,7 @@ export const filters = {
         [SPECIAL_FILTER]: 'assignee_id',
         [ALTERNATIVE_FILTER]: 'assignee_username',
       },
-      [OPERATOR_IS_NOT]: {
+      [OPERATOR_NOT]: {
         [NORMAL_FILTER]: 'not[assignee_username][]',
       },
       [OPERATOR_OR]: {
@@ -208,7 +208,7 @@ export const filters = {
         [NORMAL_FILTER]: 'milestone_title',
         [SPECIAL_FILTER]: 'milestone_title',
       },
-      [OPERATOR_IS_NOT]: {
+      [OPERATOR_NOT]: {
         [NORMAL_FILTER]: 'not[milestone_title]',
         [SPECIAL_FILTER]: 'not[milestone_title]',
       },
@@ -225,7 +225,7 @@ export const filters = {
         [SPECIAL_FILTER]: 'label_name[]',
         [ALTERNATIVE_FILTER]: 'label_name',
       },
-      [OPERATOR_IS_NOT]: {
+      [OPERATOR_NOT]: {
         [NORMAL_FILTER]: 'not[label_name][]',
       },
     },
@@ -238,7 +238,7 @@ export const filters = {
       [OPERATOR_IS]: {
         [NORMAL_FILTER]: 'type[]',
       },
-      [OPERATOR_IS_NOT]: {
+      [OPERATOR_NOT]: {
         [NORMAL_FILTER]: 'not[type][]',
       },
     },
@@ -253,7 +253,7 @@ export const filters = {
         [NORMAL_FILTER]: 'release_tag',
         [SPECIAL_FILTER]: 'release_tag',
       },
-      [OPERATOR_IS_NOT]: {
+      [OPERATOR_NOT]: {
         [NORMAL_FILTER]: 'not[release_tag]',
       },
     },
@@ -268,7 +268,7 @@ export const filters = {
         [NORMAL_FILTER]: 'my_reaction_emoji',
         [SPECIAL_FILTER]: 'my_reaction_emoji',
       },
-      [OPERATOR_IS_NOT]: {
+      [OPERATOR_NOT]: {
         [NORMAL_FILTER]: 'not[my_reaction_emoji]',
       },
     },
@@ -293,7 +293,7 @@ export const filters = {
         [NORMAL_FILTER]: 'iteration_id',
         [SPECIAL_FILTER]: 'iteration_id',
       },
-      [OPERATOR_IS_NOT]: {
+      [OPERATOR_NOT]: {
         [NORMAL_FILTER]: 'not[iteration_id]',
         [SPECIAL_FILTER]: 'not[iteration_id]',
       },
@@ -309,7 +309,7 @@ export const filters = {
         [NORMAL_FILTER]: 'epic_id',
         [SPECIAL_FILTER]: 'epic_id',
       },
-      [OPERATOR_IS_NOT]: {
+      [OPERATOR_NOT]: {
         [NORMAL_FILTER]: 'not[epic_id]',
       },
     },
@@ -324,7 +324,7 @@ export const filters = {
         [NORMAL_FILTER]: 'weight',
         [SPECIAL_FILTER]: 'weight',
       },
-      [OPERATOR_IS_NOT]: {
+      [OPERATOR_NOT]: {
         [NORMAL_FILTER]: 'not[weight]',
       },
     },
diff --git a/app/assets/javascripts/issues/list/utils.js b/app/assets/javascripts/issues/list/utils.js
index 2f9ab9d62ee..f788d633552 100644
--- a/app/assets/javascripts/issues/list/utils.js
+++ b/app/assets/javascripts/issues/list/utils.js
@@ -4,7 +4,7 @@ import { getParameterByName } from '~/lib/utils/url_utility';
 import { __ } from '~/locale';
 import {
   FILTERED_SEARCH_TERM,
-  OPERATOR_IS_NOT,
+  OPERATOR_NOT,
   OPERATOR_OR,
   TOKEN_TYPE_ASSIGNEE,
   TOKEN_TYPE_CONFIDENTIAL,
@@ -261,7 +261,7 @@ export const convertToApiParams = (filterTokens) => {
       const filterType = getFilterType(token.value.data, token.type);
       const field = filters[token.type][API_PARAM][filterType];
       let obj;
-      if (token.value.operator === OPERATOR_IS_NOT) {
+      if (token.value.operator === OPERATOR_NOT) {
         obj = not;
       } else if (token.value.operator === OPERATOR_OR) {
         obj = or;