kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Implement review comments from @DouweM.

Browse source
This commit is contained in:
Timothy Andrew 2016-09-22 20:38:05 +05:30
parent cef10ef7d7
commit b803bc7bb8
3 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/models/concerns/protected_branch_access.rb
View file

@ -2,8 +2,8 @@ module ProtectedBranchAccess
extend ActiveSupport::Concern
included do
scope :master, -> () { where(access_level: Gitlab::Access::MASTER) }
scope :developer, -> () { where(access_level: Gitlab::Access::DEVELOPER) }
scope :master, -> { where(access_level: Gitlab::Access::MASTER) }
scope :developer, -> { where(access_level: Gitlab::Access::DEVELOPER) }
end
def humanize

25
app/services/protected_branches/api_create_service.rb
View file

@ -11,17 +11,22 @@ module ProtectedBranches
end
def execute
if @developers_can_push
@params.merge!(push_access_levels_attributes: [{ access_level: Gitlab::Access::DEVELOPER }])
else
@params.merge!(push_access_levels_attributes: [{ access_level: Gitlab::Access::MASTER }])
end
push_access_level =
if @developers_can_push
Gitlab::Access::DEVELOPER
else
Gitlab::Access::MASTER
end
if @developers_can_merge
@params.merge!(merge_access_levels_attributes: [{ access_level: Gitlab::Access::DEVELOPER }])
else
@params.merge!(merge_access_levels_attributes: [{ access_level: Gitlab::Access::MASTER }])
end
merge_access_level =
if @developers_can_merge
Gitlab::Access::DEVELOPER
else
Gitlab::Access::MASTER
end
@params.merge!(push_access_levels_attributes: [{ access_level: push_access_level }],
merge_access_levels_attributes: [{ access_level: merge_access_level }])
service = ProtectedBranches::CreateService.new(@project, @current_user, @params)
service.execute

4
lib/api/branches.rb
View file

@ -57,11 +57,11 @@ module API
developers_can_merge = to_boolean(params[:developers_can_merge])
developers_can_push = to_boolean(params[:developers_can_push])
params = {
protected_branch_params = {
name: @branch.name,
}
service_args = [user_project, current_user, params,
service_args = [user_project, current_user, protected_branch_params,
developers_can_push: developers_can_push,
developers_can_merge: developers_can_merge]