Add latest changes from gitlab-org/gitlab@master

1 files changed, 33 insertions, 35 deletions

diff --git a/app/assets/javascripts/filtered_search/add_extra_tokens_for_merge_requests.js b/app/assets/javascripts/filtered_search/add_extra_tokens_for_merge_requests.js
index 6f5aef54cef..7d4df25816b 100644
--- a/app/assets/javascripts/filtered_search/add_extra_tokens_for_merge_requests.js
+++ b/app/assets/javascripts/filtered_search/add_extra_tokens_for_merge_requests.js
@@ -96,43 +96,41 @@ export default (IssuableTokenKeys, disableTargetBranchFilter = false) => {
   IssuableTokenKeys.tokenKeysWithAlternative.splice(tokenPosition, 0, ...[approvedBy.token]);
   IssuableTokenKeys.conditions.push(...approvedBy.condition);
 
-  if (gon?.features?.deploymentFilters) {
-    const environmentToken = {
-      formattedKey: __('Environment'),
-      key: 'environment',
-      type: 'string',
-      param: '',
-      symbol: '',
-      icon: 'cloud-gear',
-      tag: 'environment',
-    };
+  const environmentToken = {
+    formattedKey: __('Environment'),
+    key: 'environment',
+    type: 'string',
+    param: '',
+    symbol: '',
+    icon: 'cloud-gear',
+    tag: 'environment',
+  };
 
-    const deployedBeforeToken = {
-      formattedKey: __('Deployed-before'),
-      key: 'deployed-before',
-      type: 'string',
-      param: '',
-      symbol: '',
-      icon: 'clock',
-      tag: 'deployed_before',
-    };
+  const deployedBeforeToken = {
+    formattedKey: __('Deployed-before'),
+    key: 'deployed-before',
+    type: 'string',
+    param: '',
+    symbol: '',
+    icon: 'clock',
+    tag: 'deployed_before',
+  };
 
-    const deployedAfterToken = {
-      formattedKey: __('Deployed-after'),
-      key: 'deployed-after',
-      type: 'string',
-      param: '',
-      symbol: '',
-      icon: 'clock',
-      tag: 'deployed_after',
-    };
+  const deployedAfterToken = {
+    formattedKey: __('Deployed-after'),
+    key: 'deployed-after',
+    type: 'string',
+    param: '',
+    symbol: '',
+    icon: 'clock',
+    tag: 'deployed_after',
+  };
 
-    IssuableTokenKeys.tokenKeys.push(environmentToken, deployedBeforeToken, deployedAfterToken);
+  IssuableTokenKeys.tokenKeys.push(environmentToken, deployedBeforeToken, deployedAfterToken);
 
-    IssuableTokenKeys.tokenKeysWithAlternative.push(
-      environmentToken,
-      deployedBeforeToken,
-      deployedAfterToken,
-    );
-  }
+  IssuableTokenKeys.tokenKeysWithAlternative.push(
+    environmentToken,
+    deployedBeforeToken,
+    deployedAfterToken,
+  );
 };