summaryrefslogtreecommitdiff
path: root/app/controllers/projects/protected_branches_controller.rb
diff options
context:
space:
mode:
authorJames Edwards-Jones <jedwardsjones@gitlab.com>2017-04-05 18:59:46 +0100
committerJames Edwards-Jones <jedwardsjones@gitlab.com>2017-04-06 10:56:21 +0100
commitf16377e7dc762462817dd0b34e36811c55988b10 (patch)
tree0c2848cee6743f0648e2c3d9361d201aca7fbf1a /app/controllers/projects/protected_branches_controller.rb
parent18506d4b8b8bc780b3b1e4c61339af38b5c49bb2 (diff)
downloadgitlab-ce-f16377e7dc762462817dd0b34e36811c55988b10.tar.gz
Protected Tags backend review changes
Added changelog
Diffstat (limited to 'app/controllers/projects/protected_branches_controller.rb')
-rw-r--r--app/controllers/projects/protected_branches_controller.rb18
1 files changed, 3 insertions, 15 deletions
diff --git a/app/controllers/projects/protected_branches_controller.rb b/app/controllers/projects/protected_branches_controller.rb
index c2a55c9500a..ba24fa9acfe 100644
--- a/app/controllers/projects/protected_branches_controller.rb
+++ b/app/controllers/projects/protected_branches_controller.rb
@@ -1,32 +1,20 @@
class Projects::ProtectedBranchesController < Projects::ProtectedRefsController
protected
- def protected_ref
- @protected_branch
- end
-
- def protected_ref=(val)
- @protected_branch = val
- end
-
- def matching_refs=(val)
- @matching_branches = val
- end
-
def project_refs
@project.repository.branches
end
- def create_service
+ def create_service_class
::ProtectedBranches::CreateService
end
- def update_service
+ def update_service_class
::ProtectedBranches::UpdateService
end
def load_protected_ref
- self.protected_ref = @project.protected_branches.find(params[:id])
+ @protected_ref = @project.protected_branches.find(params[:id])
end
def protected_ref_params