From 65f3d5062f081d8f8ebf727a3408650d90ec9711 Mon Sep 17 00:00:00 2001 From: James Edwards-Jones Date: Mon, 3 Apr 2017 15:17:24 +0100 Subject: Extract ProtectedRef Concern --- lib/api/entities.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/api') diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 5954aea8041..e000e3e33d0 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -189,13 +189,13 @@ module API expose :developers_can_push do |repo_branch, options| project = options[:project] - access_levels = project.protected_branches.matching(repo_branch.name).map(&:push_access_levels).flatten + access_levels = project.protected_branches.access_levels_for_ref(repo_branch.name, :push) access_levels.any? { |access_level| access_level.access_level == Gitlab::Access::DEVELOPER } end expose :developers_can_merge do |repo_branch, options| project = options[:project] - access_levels = project.protected_branches.matching(repo_branch.name).map(&:merge_access_levels).flatten + access_levels = project.protected_branches.access_levels_for_ref(repo_branch.name, :merge) access_levels.any? { |access_level| access_level.access_level == Gitlab::Access::DEVELOPER } end end -- cgit v1.2.1 From bf3cc824e4ce6cf49a82210eaaf1cca06f7fd281 Mon Sep 17 00:00:00 2001 From: James Edwards-Jones Date: Mon, 3 Apr 2017 18:59:58 +0100 Subject: Moved Project#protected_branch? to ProtectedBranch, similar for tags --- lib/api/entities.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/api') diff --git a/lib/api/entities.rb b/lib/api/entities.rb index e000e3e33d0..0fe7eb864e4 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -184,7 +184,7 @@ module API end expose :protected do |repo_branch, options| - options[:project].protected_branch?(repo_branch.name) + ProtectedBranch.protected?(options[:project], repo_branch.name) end expose :developers_can_push do |repo_branch, options| -- cgit v1.2.1 From 90c8bb8301b4bc3268a5fa4ea8bddafbc29d6871 Mon Sep 17 00:00:00 2001 From: James Edwards-Jones Date: Tue, 4 Apr 2017 01:39:34 +0100 Subject: Fixed developers_can_push in RepoBranch API entity --- lib/api/entities.rb | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'lib/api') diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 0fe7eb864e4..0cc6188938d 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -188,15 +188,11 @@ module API end expose :developers_can_push do |repo_branch, options| - project = options[:project] - access_levels = project.protected_branches.access_levels_for_ref(repo_branch.name, :push) - access_levels.any? { |access_level| access_level.access_level == Gitlab::Access::DEVELOPER } + options[:project].protected_branches.developers_can?(:push, repo_branch.name) end expose :developers_can_merge do |repo_branch, options| - project = options[:project] - access_levels = project.protected_branches.access_levels_for_ref(repo_branch.name, :merge) - access_levels.any? { |access_level| access_level.access_level == Gitlab::Access::DEVELOPER } + options[:project].protected_branches.developers_can?(:merge, repo_branch.name) end end -- cgit v1.2.1