Add latest changes from gitlab-org/gitlab@15-1-stable-eev15.1.0-rc42

1 files changed, 9 insertions, 5 deletions

diff --git a/app/serializers/merge_request_poll_widget_entity.rb b/app/serializers/merge_request_poll_widget_entity.rb
index 12998d70a22..fc1534a88aa 100644
--- a/app/serializers/merge_request_poll_widget_entity.rb
+++ b/app/serializers/merge_request_poll_widget_entity.rb
@@ -33,13 +33,17 @@ class MergeRequestPollWidgetEntity < Grape::Entity
 
   # Booleans
   expose :mergeable_discussions_state?, as: :mergeable_discussions_state do |merge_request|
-    # This avoids calling MergeRequest#mergeable_discussions_state without
-    # considering the state of the MR first. If a MR isn't mergeable, we can
-    # safely short-circuit it.
-    if merge_request.mergeable_state?(skip_ci_check: true, skip_discussions_check: true)
+    if Feature.enabled?(:change_response_code_merge_status, merge_request.project)
       merge_request.mergeable_discussions_state?
     else
-      false
+      # This avoids calling MergeRequest#mergeable_discussions_state without
+      # considering the state of the MR first. If a MR isn't mergeable, we can
+      # safely short-circuit it.
+      if merge_request.mergeable_state?(skip_ci_check: true, skip_discussions_check: true)
+        merge_request.mergeable_discussions_state?
+      else
+        false
+      end
     end
   end