Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42

1 files changed, 26 insertions, 0 deletions

diff --git a/app/assets/javascripts/set_status_modal/components/user_availability_status.vue b/app/assets/javascripts/set_status_modal/components/user_availability_status.vue
new file mode 100644
index 00000000000..e86d94f86c6
--- /dev/null
+++ b/app/assets/javascripts/set_status_modal/components/user_availability_status.vue
@@ -0,0 +1,26 @@
+<script>
+import { AVAILABILITY_STATUS, isUserBusy, isValidAvailibility } from '../utils';
+
+export default {
+  name: 'UserAvailabilityStatus',
+  props: {
+    availability: {
+      type: String,
+      required: true,
+      validator: isValidAvailibility,
+    },
+  },
+  computed: {
+    isBusy() {
+      const { availability = AVAILABILITY_STATUS.NOT_SET } = this;
+      return isUserBusy(availability);
+    },
+  },
+};
+</script>
+
+<template>
+  <span v-if="isBusy" class="gl-font-weight-normal gl-text-gray-500">{{
+    s__('UserAvailability|(Busy)')
+  }}</span>
+</template>