diff options
| author | Igor Frenkel <ifrenkel@gitlab.com> | 2019-10-28 11:30:32 -0400 |
|---|---|---|
| committer | Igor Frenkel <ifrenkel@gitlab.com> | 2019-10-28 11:30:32 -0400 |
| commit | 77b8ae642053bb9349add94f9406cc73265ce92b (patch) | |
| tree | 30e316b7e7e33cc1414f8f0fcb60b39a88163d80 /lib/api | |
| parent | 556f83033fed763caaa6b233ca6787aecd739187 (diff) | |
| parent | a77db6bc47d8cdd9edae2ec22f640821d0794404 (diff) | |
| download | gitlab-ce-11711-add-dep-scanner-var.tar.gz | |
Merge branch 'master' into 11711-add-dep-scanner-var11711-add-dep-scanner-var
Diffstat (limited to 'lib/api')
| -rw-r--r-- | lib/api/entities.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index de12695af37..444031fd68d 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -777,6 +777,10 @@ module API expose :squash expose :task_completion_status + + expose :cannot_be_merged?, as: :has_conflicts + + expose :mergeable_discussions_state?, as: :blocking_discussions_resolved end class MergeRequest < MergeRequestBasic |