diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2018-01-30 14:50:17 +0000 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2018-01-30 14:50:17 +0000 |
| commit | 07557a946bac1b596a28293d39e7bd2581ff828b (patch) | |
| tree | f725f935880b122862880f9f18d18fb74a7f758b /lib/api | |
| parent | bf01452cc361842dab7442a9ad868213d53bd212 (diff) | |
| parent | 03f386c2b20f95272e4846f5ecab54fd8b2566e0 (diff) | |
| download | gitlab-ce-qa-define-selectors.tar.gz | |
Merge branch 'master' into 'qa-define-selectors'qa-define-selectors
# Conflicts:
# qa/qa/page/group/show.rb
Diffstat (limited to 'lib/api')
| -rw-r--r-- | lib/api/entities.rb | 10 |
1 files changed, 9 insertions, 1 deletions
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 |