Add latest changes from gitlab-org/gitlab@master

1 files changed, 4 insertions, 7 deletions

diff --git a/app/assets/javascripts/sidebar/components/attention_requested_toggle.vue b/app/assets/javascripts/sidebar/components/attention_requested_toggle.vue
index cdc1c65a516..cd1aae155d2 100644
--- a/app/assets/javascripts/sidebar/components/attention_requested_toggle.vue
+++ b/app/assets/javascripts/sidebar/components/attention_requested_toggle.vue
@@ -5,9 +5,8 @@ import { BV_HIDE_TOOLTIP } from '~/lib/utils/constants';
 
 export default {
   i18n: {
-    attentionRequestedReviewer: __('Request attention to review'),
-    attentionRequestedAssignee: __('Request attention'),
-    removeAttentionRequested: __('Remove attention request'),
+    addAttentionRequest: __('Add attention request'),
+    removeAttentionRequest: __('Remove attention request'),
     attentionRequestedNoPermission: __('Attention requested'),
     noAttentionRequestedNoPermission: __('No attention request'),
   },
@@ -36,16 +35,14 @@ export default {
     tooltipTitle() {
       if (this.user.attention_requested) {
         if (this.user.can_update_merge_request) {
-          return this.$options.i18n.removeAttentionRequested;
+          return this.$options.i18n.removeAttentionRequest;
         }
 
         return this.$options.i18n.attentionRequestedNoPermission;
       }
 
       if (this.user.can_update_merge_request) {
-        return this.type === 'reviewer'
-          ? this.$options.i18n.attentionRequestedReviewer
-          : this.$options.i18n.attentionRequestedAssignee;
+        return this.$options.i18n.addAttentionRequest;
       }
 
       return this.$options.i18n.noAttentionRequestedNoPermission;