Implement review comments from @DouweM.

app/models/concerns/protected_branch_access.rb

@@ -9,8 +9,8 @@ module ProtectedBranchAccess
                             unless: Proc.new { |access_level| access_level.user_id? || access_level.group_id? },
                             conditions: -> { where(user_id: nil, group_id: nil) }
 
-    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 type

app/services/protected_branches/api_create_service.rb

@@ -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

lib/api/branches.rb

@@ -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]