Add latest changes from gitlab-org/gitlab@15-3-stable-eev15.3.0-rc42

1 files changed, 1 insertions, 12 deletions

diff --git a/app/presenters/merge_request_presenter.rb b/app/presenters/merge_request_presenter.rb
index efab1e84923..417a2f9c51f 100644
--- a/app/presenters/merge_request_presenter.rb
+++ b/app/presenters/merge_request_presenter.rb
@@ -191,18 +191,7 @@ class MergeRequestPresenter < Gitlab::View::Presenter::Delegated
   end
 
   def mergeable_discussions_state
-    if Feature.enabled?(:change_response_code_merge_status, project)
-      merge_request.mergeable_discussions_state?
-    else
-      # 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
+    merge_request.mergeable_discussions_state?
   end
 
   delegator_override :subscribed?