Merge branch 'jej-rename-legacy-protected-branches-api-service' into 'master'

app/services/protected_branches/api_create_service.rb → app/services/protected_branches/legacy_api_create_service.rb

-# The protected branches API still uses the `developers_can_push` and `developers_can_merge`
+# The branches#protect API still uses the `developers_can_push` and `developers_can_merge`
 # flags for backward compatibility, and so performs translation between that format and the
 # internal data model (separate access levels). The translation code is non-trivial, and so
 # lives in this service.
 module ProtectedBranches
-  class ApiCreateService < BaseService
+  class LegacyApiCreateService < BaseService
     def execute
       push_access_level =
         if params.delete(:developers_can_push)

app/services/protected_branches/api_update_service.rb → app/services/protected_branches/legacy_api_update_service.rb

-# The protected branches API still uses the `developers_can_push` and `developers_can_merge`
+# The branches#protect API still uses the `developers_can_push` and `developers_can_merge`
 # flags for backward compatibility, and so performs translation between that format and the
 # internal data model (separate access levels). The translation code is non-trivial, and so
 # lives in this service.
 module ProtectedBranches
-  class ApiUpdateService < BaseService
+  class LegacyApiUpdateService < BaseService
     def execute(protected_branch)
       @developers_can_push = params.delete(:developers_can_push)
       @developers_can_merge = params.delete(:developers_can_merge)

lib/api/branches.rb

@@ -81,9 +81,9 @@ module API
         service_args = [user_project, current_user, protected_branch_params]
 
         protected_branch = if protected_branch
-                             ::ProtectedBranches::ApiUpdateService.new(*service_args).execute(protected_branch)
+                             ::ProtectedBranches::LegacyApiUpdateService.new(*service_args).execute(protected_branch)
                            else
-                             ::ProtectedBranches::ApiCreateService.new(*service_args).execute
+                             ::ProtectedBranches::LegacyApiCreateService.new(*service_args).execute
                            end
 
         if protected_branch.valid?