From 1db2f22b15c08c96f02796bb64715d184793ffa3 Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Thu, 25 Jan 2018 11:12:14 +0000 Subject: Revert "Merge branch 'osw-updates-merge-status-on-api-actions' into 'master'" This reverts merge request !16626 --- .../unreleased/osw-updates-merge-status-on-api-actions.yml | 5 ----- lib/api/entities.rb | 11 +---------- 2 files changed, 1 insertion(+), 15 deletions(-) delete mode 100644 changelogs/unreleased/osw-updates-merge-status-on-api-actions.yml diff --git a/changelogs/unreleased/osw-updates-merge-status-on-api-actions.yml b/changelogs/unreleased/osw-updates-merge-status-on-api-actions.yml deleted file mode 100644 index 3854985e576..00000000000 --- a/changelogs/unreleased/osw-updates-merge-status-on-api-actions.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -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 5b470bd3479..7b9a80a234b 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -507,16 +507,7 @@ module API expose :work_in_progress?, as: :work_in_progress expose :milestone, using: Entities::Milestone expose :merge_when_pipeline_succeeds - - # 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| - # In order to avoid having a breaking change for users, we keep returning the - # expected values from MergeRequest#merge_status state machine. - merge_request.mergeable? ? 'can_be_merged' : 'cannot_be_merged' - end + expose :merge_status expose :diff_head_sha, as: :sha expose :merge_commit_sha expose :user_notes_count -- cgit v1.2.1