diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-01-29 19:06:34 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-01-29 19:06:34 +0000 |
| commit | 7a18675c59d46da7234dd0cdf6960b527b513a80 (patch) | |
| tree | c2847376bbe2195ea43e40992302030fea2dcf76 | |
| parent | 86dc598518b1e4dd5a5c02ac8e0cb6930e7e36c4 (diff) | |
| parent | 395e500f0143258c956f11e09dda676d7ed2b554 (diff) | |
| download | gitlab-ce-7a18675c59d46da7234dd0cdf6960b527b513a80.tar.gz | |
Merge branch 'osw-consistent-values-on-api-merge-status' into 'master'
Return more consistent values for merge_status on MR API
Closes #20639
See merge request gitlab-org/gitlab-ce!16708
| -rw-r--r-- | changelogs/unreleased/osw-updates-merge-status-on-api-actions.yml | 5 | ||||
| -rw-r--r-- | lib/api/entities.rb | 10 | ||||
| -rw-r--r-- | spec/requests/api/merge_requests_spec.rb | 2 |
3 files changed, 16 insertions, 1 deletions
diff --git a/changelogs/unreleased/osw-updates-merge-status-on-api-actions.yml b/changelogs/unreleased/osw-updates-merge-status-on-api-actions.yml new file mode 100644 index 00000000000..3854985e576 --- /dev/null +++ b/changelogs/unreleased/osw-updates-merge-status-on-api-actions.yml @@ -0,0 +1,5 @@ +--- +title: Return more consistent values for merge_status on MR APIs +merge_request: +author: +type: fixed diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 7b9a80a234b..cb222697f32 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -507,7 +507,15 @@ module API expose :work_in_progress?, as: :work_in_progress expose :milestone, using: Entities::Milestone expose :merge_when_pipeline_succeeds - expose :merge_status + + # Ideally we should deprecate `MergeRequest#merge_status` exposure and + # use `MergeRequest#mergeable?` instead (boolean). + # See https://gitlab.com/gitlab-org/gitlab-ce/issues/42344 for more + # information. + expose :merge_status do |merge_request| + merge_request.check_if_can_be_merged + merge_request.merge_status + end expose :diff_head_sha, as: :sha expose :merge_commit_sha expose :user_notes_count diff --git a/spec/requests/api/merge_requests_spec.rb b/spec/requests/api/merge_requests_spec.rb index 8e2982f1a5d..14dd9da119d 100644 --- a/spec/requests/api/merge_requests_spec.rb +++ b/spec/requests/api/merge_requests_spec.rb @@ -198,6 +198,8 @@ describe API::MergeRequests do create(:merge_request, state: 'closed', milestone: milestone1, author: user, assignee: user, source_project: project, target_project: project, title: "Test", created_at: base_time) + create(:merge_request, milestone: milestone1, author: user, assignee: user, source_project: project, target_project: project, title: "Test", created_at: base_time) + expect do get api("/projects/#{project.id}/merge_requests", user) end.not_to exceed_query_limit(control) |