diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2017-10-06 00:56:53 +0300 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2017-10-06 00:56:53 +0300 |
| commit | 64a6552b51fa474ea09b55182896e45b5e41410a (patch) | |
| tree | b6dff5b20bb7d3fc07c4976ef41196930278d727 /app/serializers | |
| parent | 2e76b8a960313feedaaace06503cba097572747e (diff) | |
| parent | 6a5b2fe8943190cff40e6e2c5dbc629fa4540151 (diff) | |
Merge branch '38389-allow-merge-without-success' into 'master'
Allow merge when no pipeline success
Closes #38389
See merge request gitlab-org/gitlab-ce!14633
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| |