Protected Tags backend review changes

Added changelog

3 files changed, 16 insertions, 41 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
diff --git a/app/controllers/projects/protected_refs_controller.rb b/app/controllers/projects/protected_refs_controller.rb
index 63f005124a9..083a70968e5 100644
--- a/app/controllers/projects/protected_refs_controller.rb
+++ b/app/controllers/projects/protected_refs_controller.rb
@@ -1,5 +1,6 @@
 class Projects::ProtectedRefsController < Projects::ApplicationController
   include RepositorySettingsRedirect
+
   # Authorize
   before_action :require_non_empty_project
   before_action :authorize_admin_project!
@@ -12,33 +13,31 @@ class Projects::ProtectedRefsController < Projects::ApplicationController
   end
 
   def create
-    self.protected_ref = create_service.new(@project, current_user, protected_ref_params).execute
+    protected_ref = create_service_class.new(@project, current_user, protected_ref_params).execute
+
     unless protected_ref.persisted?
       flash[:alert] = protected_ref.errors.full_messages.join(', ').html_safe
     end
+
     redirect_to_repository_settings(@project)
   end
 
   def show
-    self.matching_refs = protected_ref.matching(project_refs)
+    @matching_refs = @protected_ref.matching(project_refs)
   end
 
   def update
-    self.protected_ref = update_service.new(@project, current_user, protected_ref_params).execute(protected_ref)
+    @protected_ref = update_service_class.new(@project, current_user, protected_ref_params).execute(@protected_ref)
 
-    if protected_ref.valid?
-      respond_to do |format|
-        format.json { render json: protected_ref, status: :ok }
-      end
+    if @protected_ref.valid?
+      render json: @protected_ref, status: :ok
     else
-      respond_to do |format|
-        format.json { render json: protected_ref.errors, status: :unprocessable_entity }
-      end
+      render json: @protected_ref.errors, status: :unprocessable_entity
     end
   end
 
   def destroy
-    protected_ref.destroy
+    @protected_ref.destroy
 
     respond_to do |format|
       format.html { redirect_to_repository_settings(@project) }
diff --git a/app/controllers/projects/protected_tags_controller.rb b/app/controllers/projects/protected_tags_controller.rb
index 0e00baedbdf..c61ddf145e6 100644
--- a/app/controllers/projects/protected_tags_controller.rb
+++ b/app/controllers/projects/protected_tags_controller.rb
@@ -1,32 +1,20 @@
 class Projects::ProtectedTagsController < Projects::ProtectedRefsController
   protected
 
-  def protected_ref
-    @protected_tag
-  end
-
-  def protected_ref=(val)
-    @protected_tag = val
-  end
-
-  def matching_refs=(val)
-    @matching_tags = val
-  end
-
   def project_refs
     @project.repository.tags
   end
 
-  def create_service
+  def create_service_class
     ::ProtectedTags::CreateService
   end
 
-  def update_service
+  def update_service_class
     ::ProtectedTags::UpdateService
   end
 
   def load_protected_ref
-    self.protected_ref = @project.protected_tags.find(params[:id])
+    @protected_ref = @project.protected_tags.find(params[:id])
   end
 
   def protected_ref_params