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 | 5 |
1 files changed, 4 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 8b0f3c8eb74..5bf02c93c99 100644 --- a/app/serializers/merge_request_poll_cached_widget_entity.rb +++ b/app/serializers/merge_request_poll_cached_widget_entity.rb @@ -17,7 +17,6 @@ class MergeRequestPollCachedWidgetEntity < IssuableEntity expose :target_project_id expose :squash expose :rebase_in_progress?, as: :rebase_in_progress - expose :default_squash_commit_message expose :commits_count expose :merge_ongoing?, as: :merge_ongoing expose :work_in_progress?, as: :work_in_progress @@ -27,6 +26,10 @@ class MergeRequestPollCachedWidgetEntity < IssuableEntity expose :source_branch_exists?, as: :source_branch_exists expose :branch_missing?, as: :branch_missing + expose :default_squash_commit_message do |merge_request| + merge_request.default_squash_commit_message(user: request.current_user) + end + expose :commits_without_merge_commits, using: MergeRequestWidgetCommitEntity do |merge_request| merge_request.recent_commits.without_merge_commits end |