From 6a5b2fe8943190cff40e6e2c5dbc629fa4540151 Mon Sep 17 00:00:00 2001 From: Eric Eastwood Date: Mon, 2 Oct 2017 11:11:18 -0500 Subject: Allow merge when no pipeline success Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/38389 --- app/serializers/merge_request_entity.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'app/serializers') diff --git a/app/serializers/merge_request_entity.rb b/app/serializers/merge_request_entity.rb index 36537c5bd02..297a459e394 100644 --- a/app/serializers/merge_request_entity.rb +++ b/app/serializers/merge_request_entity.rb @@ -42,6 +42,7 @@ class MergeRequestEntity < IssuableEntity expose :commits_count expose :cannot_be_merged?, as: :has_conflicts expose :can_be_merged?, as: :can_be_merged + expose :mergeable?, as: :mergeable expose :remove_source_branch?, as: :remove_source_branch expose :project_archived do |merge_request| -- cgit v1.2.3