diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-20 12:06:01 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-20 12:06:01 +0000 |
| commit | a68e9d3318c6847436f81f83eb347b29f52d1bff (patch) | |
| tree | 511a790297f7e771f8d73025b9a1f9b4a0586d71 /app/serializers/merge_request_poll_cached_widget_entity.rb | |
| parent | 7bc0aff0b4e15fce828621d7e0919d84368f3d2b (diff) | |
| download | gitlab-ce-a68e9d3318c6847436f81f83eb347b29f52d1bff.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/serializers/merge_request_poll_cached_widget_entity.rb')
| -rw-r--r-- | app/serializers/merge_request_poll_cached_widget_entity.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/app/serializers/merge_request_poll_cached_widget_entity.rb b/app/serializers/merge_request_poll_cached_widget_entity.rb index a7ff74fb888..c7dc8c43a9a 100644 --- a/app/serializers/merge_request_poll_cached_widget_entity.rb +++ b/app/serializers/merge_request_poll_cached_widget_entity.rb @@ -15,7 +15,7 @@ class MergeRequestPollCachedWidgetEntity < IssuableEntity expose :target_project_id expose :squash expose :rebase_in_progress?, as: :rebase_in_progress - expose :default_squash_commit_message + expose :default_squash_commit_message, if: -> (merge_request, _) { merge_request.mergeable? } expose :commits_count expose :merge_ongoing?, as: :merge_ongoing expose :work_in_progress?, as: :work_in_progress @@ -25,8 +25,9 @@ class MergeRequestPollCachedWidgetEntity < IssuableEntity expose :source_branch_exists?, as: :source_branch_exists expose :branch_missing?, as: :branch_missing - expose :commits_without_merge_commits, using: MergeRequestWidgetCommitEntity do |merge_request| - merge_request.commits.without_merge_commits + expose :commits_without_merge_commits, using: MergeRequestWidgetCommitEntity, + if: -> (merge_request, _) { merge_request.mergeable? } do |merge_request| + merge_request.recent_commits.without_merge_commits end expose :diff_head_sha do |merge_request| merge_request.diff_head_sha.presence |