summaryrefslogtreecommitdiff
path: root/app/serializers/merge_request_poll_widget_entity.rb
diff options
context:
space:
mode:
Diffstat (limited to 'app/serializers/merge_request_poll_widget_entity.rb')
-rw-r--r--app/serializers/merge_request_poll_widget_entity.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/serializers/merge_request_poll_widget_entity.rb b/app/serializers/merge_request_poll_widget_entity.rb
index 074bd2d18d7..f68477e82c9 100644
--- a/app/serializers/merge_request_poll_widget_entity.rb
+++ b/app/serializers/merge_request_poll_widget_entity.rb
@@ -19,7 +19,9 @@ class MergeRequestPollWidgetEntity < Grape::Entity
# User entities
expose :merge_user, using: UserEntity
- expose :default_merge_commit_message
+ expose :default_merge_commit_message do |merge_request, options|
+ merge_request.default_merge_commit_message(include_description: false, user: current_user)
+ end
expose :mergeable do |merge_request, options|
next merge_request.mergeable? if Feature.disabled?(:check_mergeability_async_in_widget, merge_request.project, default_enabled: :yaml)