From ee664acb356f8123f4f6b00b73c1e1cf0866c7fb Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Thu, 20 Oct 2022 09:40:42 +0000
Subject: Add latest changes from gitlab-org/gitlab@15-5-stable-ee

---
 app/assets/javascripts/set_status_modal/set_status_form.vue | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'app/assets/javascripts/set_status_modal/set_status_form.vue')

diff --git a/app/assets/javascripts/set_status_modal/set_status_form.vue b/app/assets/javascripts/set_status_modal/set_status_form.vue
index 7f9a30b7ff1..86049a2b781 100644
--- a/app/assets/javascripts/set_status_modal/set_status_form.vue
+++ b/app/assets/javascripts/set_status_modal/set_status_form.vue
@@ -131,9 +131,9 @@ export default {
   i18n: {
     statusMessagePlaceholder: s__(`SetStatusModal|What's your status?`),
     clearStatusButtonLabel: s__('SetStatusModal|Clear status'),
-    availabilityCheckboxLabel: s__('SetStatusModal|Busy'),
+    availabilityCheckboxLabel: s__('SetStatusModal|Set yourself as busy'),
     availabilityCheckboxHelpText: s__(
-      'SetStatusModal|An indicator appears next to your name and avatar',
+      'SetStatusModal|Displays that you are busy or not able to respond',
     ),
     clearStatusAfterDropdownLabel: s__('SetStatusModal|Clear status after'),
     clearStatusAfterMessage: s__('SetStatusModal|Your status resets on %{date}.'),
@@ -161,11 +161,7 @@ export default {
           @click="handleEmojiClick"
         >
           <template #button-content>
-            <span
-              v-if="noEmoji"
-              class="no-emoji-placeholder position-relative"
-              data-testid="no-emoji-placeholder"
-            >
+            <span v-if="noEmoji" class="gl-relative" data-testid="no-emoji-placeholder">
               <gl-icon name="slight-smile" class="award-control-icon-neutral" />
               <gl-icon name="smiley" class="award-control-icon-positive" />
               <gl-icon name="smile" class="award-control-icon-super-positive" />
-- 
cgit v1.2.3