diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-09 15:11:57 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-09 15:11:57 +0300 |
commit | 1f229cdc22b5b32989bcff2037d8925c75703671 (patch) | |
tree | c92e9dff7737e78d7331518cdf69f90403af09ea /app/serializers | |
parent | 7a98d989740ec85982cdb6c1d57c8f24270e455e (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/serializers')
-rw-r--r-- | app/serializers/merge_request_poll_widget_entity.rb | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/app/serializers/merge_request_poll_widget_entity.rb b/app/serializers/merge_request_poll_widget_entity.rb index fc1534a88aa..40bb905c5c9 100644 --- a/app/serializers/merge_request_poll_widget_entity.rb +++ b/app/serializers/merge_request_poll_widget_entity.rb @@ -33,18 +33,7 @@ class MergeRequestPollWidgetEntity < Grape::Entity # Booleans expose :mergeable_discussions_state?, as: :mergeable_discussions_state do |merge_request| - if Feature.enabled?(:change_response_code_merge_status, merge_request.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 expose :project_archived do |merge_request| |