summaryrefslogtreecommitdiff
path: root/lib/api/entities.rb
diff options
context:
space:
mode:
authorRobert Schilling <rschilling@student.tugraz.at>2016-07-19 10:36:18 +0200
committerRobert Schilling <rschilling@student.tugraz.at>2016-07-19 11:12:03 +0200
commite552b4af26b68a8b4bedc775a128a8ecd59ff689 (patch)
treea579e7051dbf385946056a38525000a441c405ff /lib/api/entities.rb
parent54d26c89f66abb2bfec7403fd6b3ed7700e73766 (diff)
downloadgitlab-ce-e552b4af26b68a8b4bedc775a128a8ecd59ff689.tar.gz
API: Expose 'developers_can_merge' for branches
Diffstat (limited to 'lib/api/entities.rb')
-rw-r--r--lib/api/entities.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index e4ae5adafd6..d6fed1a1eed 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -136,6 +136,12 @@ module API
options[:project].developers_can_push_to_protected_branch? repo_obj.name
end
end
+
+ expose :developers_can_merge do |repo_obj, options|
+ if options[:project]
+ options[:project].developers_can_merge_to_protected_branch? repo_obj.name
+ end
+ end
end
class RepoTreeObject < Grape::Entity