From 54d26c89f66abb2bfec7403fd6b3ed7700e73766 Mon Sep 17 00:00:00 2001 From: Robert Schilling Date: Tue, 12 Jul 2016 16:31:55 +0200 Subject: API: Expose 'developers_can_push' for branches --- lib/api/entities.rb | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'lib/api/entities.rb') diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 3c79a00eb8c..e4ae5adafd6 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -125,9 +125,15 @@ module API end end - expose :protected do |repo, options| + expose :protected do |repo_obj, options| if options[:project] - options[:project].protected_branch? repo.name + options[:project].protected_branch? repo_obj.name + end + end + + expose :developers_can_push do |repo_obj, options| + if options[:project] + options[:project].developers_can_push_to_protected_branch? repo_obj.name end end end -- cgit v1.2.1 From e552b4af26b68a8b4bedc775a128a8ecd59ff689 Mon Sep 17 00:00:00 2001 From: Robert Schilling Date: Tue, 19 Jul 2016 10:36:18 +0200 Subject: API: Expose 'developers_can_merge' for branches --- lib/api/entities.rb | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'lib/api/entities.rb') 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 -- cgit v1.2.1