Add latest changes from gitlab-org/gitlab@master

1 files changed, 15 insertions, 0 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 d00e6e59cf5..28a3c54cc8f 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
@@ -13,6 +13,21 @@ export default (IssuableTokenKeys, disableTargetBranchFilter = false) => {
   IssuableTokenKeys.tokenKeys.splice(2, 0, reviewerToken);
   IssuableTokenKeys.tokenKeysWithAlternative.splice(2, 0, reviewerToken);
 
+  if (window.gon?.features?.mrAttentionRequests) {
+    const attentionRequestedToken = {
+      formattedKey: __('Attention'),
+      key: 'attention',
+      type: 'string',
+      param: '',
+      symbol: '@',
+      icon: 'user',
+      tag: '@attention',
+      hideNotEqual: true,
+    };
+    IssuableTokenKeys.tokenKeys.splice(2, 0, attentionRequestedToken);
+    IssuableTokenKeys.tokenKeysWithAlternative.splice(2, 0, attentionRequestedToken);
+  }
+
   const draftToken = {
     token: {
       formattedKey: __('Draft'),