diff options
Diffstat (limited to 'app/serializers/merge_request_poll_cached_widget_entity.rb')
| -rw-r--r-- | app/serializers/merge_request_poll_cached_widget_entity.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/serializers/merge_request_poll_cached_widget_entity.rb b/app/serializers/merge_request_poll_cached_widget_entity.rb index 5bf02c93c99..9d001d18aa6 100644 --- a/app/serializers/merge_request_poll_cached_widget_entity.rb +++ b/app/serializers/merge_request_poll_cached_widget_entity.rb @@ -8,7 +8,6 @@ class MergeRequestPollCachedWidgetEntity < IssuableEntity expose :merged_commit_sha expose :short_merged_commit_sha expose :merge_error - expose :public_merge_status, as: :merge_status expose :merge_user_id expose :source_branch expose :source_project_id @@ -26,6 +25,11 @@ class MergeRequestPollCachedWidgetEntity < IssuableEntity expose :source_branch_exists?, as: :source_branch_exists expose :branch_missing?, as: :branch_missing + expose :merge_status do |merge_request| + merge_request.check_mergeability(async: true) + merge_request.public_merge_status + end + expose :default_squash_commit_message do |merge_request| merge_request.default_squash_commit_message(user: request.current_user) end |