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

Implement third round of review comments from @DouweM. 

Extract/mutate `params` in the `execute` method of the API services,
rather than in `initialize`.
This commit is contained in:
Timothy Andrew 2016-10-24 11:32:09 +05:30
parent 1051087ac4
commit db0182e261
2 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/services/protected_branches/api_create_service.rb
View File

@ -4,22 +4,16 @@
# lives in this service. # lives in this service.
module ProtectedBranches module ProtectedBranches
class ApiCreateService < BaseService class ApiCreateService < BaseService
def initialize(project, user, params)
@developers_can_merge = params.delete(:developers_can_merge)
@developers_can_push = params.delete(:developers_can_push)
super(project, user, params)
end
def execute def execute
push_access_level = push_access_level =
if @developers_can_push if params.delete(:developers_can_push)
Gitlab::Access::DEVELOPER Gitlab::Access::DEVELOPER
else else
Gitlab::Access::MASTER Gitlab::Access::MASTER
end end
merge_access_level = merge_access_level =
if @developers_can_merge if params.delete(:developers_can_merge)
Gitlab::Access::DEVELOPER Gitlab::Access::DEVELOPER
else else
Gitlab::Access::MASTER Gitlab::Access::MASTER

9
app/services/protected_branches/api_update_service.rb
View File

@ -4,13 +4,10 @@
# lives in this service. # lives in this service.
module ProtectedBranches module ProtectedBranches
class ApiUpdateService < BaseService class ApiUpdateService < BaseService
def initialize(project, user, params)
@developers_can_merge = params.delete(:developers_can_merge)
@developers_can_push = params.delete(:developers_can_push)
super(project, user, params)
end
def execute(protected_branch) def execute(protected_branch)
@developers_can_push = params.delete(:developers_can_push)
@developers_can_merge = params.delete(:developers_can_merge)
@protected_branch = protected_branch @protected_branch = protected_branch
protected_branch.transaction do protected_branch.transaction do