Services: code style fixes, minor refactoringservices_refactoring1

1 files changed, 2 insertions, 10 deletions

diff --git a/app/services/delete_branch_service.rb b/app/services/delete_branch_service.rb
index 752a7029952..332c55581a1 100644
--- a/app/services/delete_branch_service.rb
+++ b/app/services/delete_branch_service.rb
@@ -5,7 +5,6 @@ class DeleteBranchService < BaseService
     repository = project.repository
     branch = repository.find_branch(branch_name)
 
-    # No such branch
     unless branch
       return error('No such branch', 404)
     end
@@ -14,18 +13,15 @@ class DeleteBranchService < BaseService
       return error('Cannot remove HEAD branch', 405)
     end
 
-    # Dont allow remove of protected branch
     if project.protected_branch?(branch_name)
       return error('Protected branch cant be removed', 405)
     end
 
-    # Dont allow user to remove branch if he is not allowed to push
     unless current_user.can?(:push_code, project)
       return error('You dont have push access to repo', 405)
     end
 
     if repository.rm_branch(current_user, branch_name)
-      # GitPushService handles execution of services and hooks for branch pushes
       success('Branch was removed')
     else
       error('Failed to remove branch')
@@ -35,15 +31,11 @@ class DeleteBranchService < BaseService
   end
 
   def error(message, return_code = 400)
-    out = super(message)
-    out[:return_code] = return_code
-    out
+    super(message).merge(return_code: return_code)
   end
 
   def success(message)
-    out = super()
-    out[:message] = message
-    out
+    super().merge(message: message)
   end
 
   def build_push_data(branch)