Merge branch 'api-branch-status' into 'master'

API: Expose branch status

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/24938

See merge request !7796

1 files changed, 5 insertions, 1 deletions

diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index fdb19558c1c..d5dfb8d00be 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -141,8 +141,12 @@ module API
         options[:project].repository.commit(repo_branch.dereferenced_target)
       end
 
+      expose :merged do |repo_branch, options|
+        options[:project].repository.merged_to_root_ref?(repo_branch.name)
+      end
+
       expose :protected do |repo_branch, options|
-        options[:project].protected_branch? repo_branch.name
+        options[:project].protected_branch?(repo_branch.name)
       end
 
       expose :developers_can_push do |repo_branch, options|