Add latest changes from gitlab-org/gitlab@master

2 files changed, 12 insertions, 2 deletions

diff --git a/lib/gitlab/danger/roulette.rb b/lib/gitlab/danger/roulette.rb
index 0700a72c918..dbf42912882 100644
--- a/lib/gitlab/danger/roulette.rb
+++ b/lib/gitlab/danger/roulette.rb
@@ -50,7 +50,7 @@ module Gitlab
       # @param [Teammate] person
       # @return [Boolean]
       def valid_person?(person)
-        !mr_author?(person) && !person.out_of_office?
+        !mr_author?(person) && person.available?
       end
 
       # @param [Teammate] person
diff --git a/lib/gitlab/danger/teammate.rb b/lib/gitlab/danger/teammate.rb
index c0a2d909f69..5c2324836d7 100644
--- a/lib/gitlab/danger/teammate.rb
+++ b/lib/gitlab/danger/teammate.rb
@@ -44,11 +44,21 @@ module Gitlab
       end
 
       # @return [Boolean]
+      def available?
+        !out_of_office? && has_capacity?
+      end
+
+      private
+
+      # @return [Boolean]
       def out_of_office?
         status&.dig("message")&.match?(/OOO/i) || false
       end
 
-      private
+      # @return [Boolean]
+      def has_capacity?
+        status&.dig("emoji") != 'red_circle'
+      end
 
       def has_capability?(project, category, kind, labels)
         case category