diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-11-23 15:28:41 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-11-23 15:28:41 +0000 |
| commit | 3026cb204742cc44047ea491ea12224ac2f8a007 (patch) | |
| tree | a4f7f244eeff8ca3e4d374b66135fa7ec7748ab0 /lib/api | |
| parent | 505cba59eb3bea137de8eaa1f1468d13d710c9e9 (diff) | |
| parent | fceffe4dca9af5ab3ffaa2e110c5fb4bad254950 (diff) | |
| download | gitlab-ce-3026cb204742cc44047ea491ea12224ac2f8a007.tar.gz | |
Merge branch 'jej-rename-legacy-protected-branches-api-service' into 'master'
Renamed ProtectedBranches::ApiUpdateService to LegacyApiUpdateService
See merge request gitlab-org/gitlab-ce!15575
Diffstat (limited to 'lib/api')
| -rw-r--r-- | lib/api/branches.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/api/branches.rb b/lib/api/branches.rb index cdef1b546a9..0791a110c39 100644 --- a/lib/api/branches.rb +++ b/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? |