Add latest changes from gitlab-org/gitlab@master

1 files changed, 12 insertions, 18 deletions

diff --git a/app/assets/javascripts/filtered_search/issuable_filtered_search_token_keys.js b/app/assets/javascripts/filtered_search/issuable_filtered_search_token_keys.js
index 414bcf186a3..eb518eb1f52 100644
--- a/app/assets/javascripts/filtered_search/issuable_filtered_search_token_keys.js
+++ b/app/assets/javascripts/filtered_search/issuable_filtered_search_token_keys.js
@@ -1,9 +1,7 @@
 import FilteredSearchTokenKeys from './filtered_search_token_keys';
 import { __ } from '~/locale';
 
-export const tokenKeys = [];
-
-tokenKeys.push(
+export const tokenKeys = [
   {
     key: 'author',
     type: 'string',
@@ -28,27 +26,23 @@ tokenKeys.push(
     icon: 'clock',
     tag: '%milestone',
   },
-);
-
-if (gon && gon.features && gon.features.releaseSearchFilter) {
-  tokenKeys.push({
+  {
     key: 'release',
     type: 'string',
     param: 'tag',
     symbol: '',
     icon: 'rocket',
     tag: __('tag name'),
-  });
-}
-
-tokenKeys.push({
-  key: 'label',
-  type: 'array',
-  param: 'name[]',
-  symbol: '~',
-  icon: 'labels',
-  tag: '~label',
-});
+  },
+  {
+    key: 'label',
+    type: 'array',
+    param: 'name[]',
+    symbol: '~',
+    icon: 'labels',
+    tag: '~label',
+  },
+];
 
 if (gon.current_user_id) {
   // Appending tokenkeys only logged-in