diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-28 12:06:04 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-28 12:06:04 +0300 |
commit | 29eea410c440212730a33ddf610483fe095c8670 (patch) | |
tree | b3071ada8f9524f99bf8479006553b8146365792 /lib | |
parent | 1a3d7b9fcda9e4eecd22b84f4254efc07344b284 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib')
-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 |