diff options
| author | Eric Eastwood <contact@ericeastwood.com> | 2017-10-02 11:11:18 -0500 |
|---|---|---|
| committer | Eric Eastwood <contact@ericeastwood.com> | 2017-10-05 01:46:16 -0500 |
| commit | 6a5b2fe8943190cff40e6e2c5dbc629fa4540151 (patch) | |
| tree | 220edd683a2837209e64cfc38c8c2f1d5225f2d4 /app/serializers | |
| parent | 8921af39e74976e37e92c786bd957883110f6522 (diff) | |
| download | gitlab-ce-6a5b2fe8943190cff40e6e2c5dbc629fa4540151.tar.gz | |
Allow merge when no pipeline success38389-allow-merge-without-success
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/38389
Diffstat (limited to 'app/serializers')
| -rw-r--r-- | app/serializers/merge_request_entity.rb | 1 |
1 files changed, 1 insertions, 0 deletions
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| |