Add latest changes from gitlab-org/gitlab@master

1 files changed, 34 insertions, 10 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 6c3d9e33420..414bcf186a3 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,7 +1,9 @@
 import FilteredSearchTokenKeys from './filtered_search_token_keys';
 import { __ } from '~/locale';
 
-export const tokenKeys = [
+export const tokenKeys = [];
+
+tokenKeys.push(
   {
     key: 'author',
     type: 'string',
@@ -26,15 +28,27 @@ export const tokenKeys = [
     icon: 'clock',
     tag: '%milestone',
   },
-  {
-    key: 'label',
-    type: 'array',
-    param: 'name[]',
-    symbol: '~',
-    icon: 'labels',
-    tag: '~label',
-  },
-];
+);
+
+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',
+});
 
 if (gon.current_user_id) {
   // Appending tokenkeys only logged-in
@@ -89,6 +103,16 @@ export const conditions = [
     value: __('Started'),
   },
   {
+    url: 'release_tag=None',
+    tokenKey: 'release',
+    value: __('None'),
+  },
+  {
+    url: 'release_tag=Any',
+    tokenKey: 'release',
+    value: __('Any'),
+  },
+  {
     url: 'label_name[]=None',
     tokenKey: 'label',
     value: __('None'),