From 95b84e2c5aa92a5a8effc108fdbdf596dff4818c Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Tue, 1 Apr 2014 10:33:23 +0300
Subject: [PATCH] Move branch creation logic in service
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
app/controllers/projects/branches_controller.rb | 6 +-----
app/services/create_branch_service.rb | 13 +++++++++++++
2 files changed, 14 insertions(+), 5 deletions(-)
create mode 100644 app/services/create_branch_service.rb
diff --git a/app/controllers/projects/branches_controller.rb b/app/controllers/projects/branches_controller.rb
index aa6914414ceb6..6a6cbe4818405 100644
--- a/app/controllers/projects/branches_controller.rb
+++ b/app/controllers/projects/branches_controller.rb
@@ -16,11 +16,7 @@ def recent
end
def create
- @repository.add_branch(params[:branch_name], params[:ref])
-
- if new_branch = @repository.find_branch(params[:branch_name])
- Event.create_ref_event(@project, current_user, new_branch, 'add')
- end
+ CreateBranchService.new.execute(project, params[:branch_name], params[:ref], current_user)
redirect_to project_branches_path(@project)
end
diff --git a/app/services/create_branch_service.rb b/app/services/create_branch_service.rb
new file mode 100644
index 0000000000000..98beeee8354a3
--- /dev/null
+++ b/app/services/create_branch_service.rb
@@ -0,0 +1,13 @@
+class CreateBranchService
+ def execute(project, branch_name, ref, current_user)
+ repository = project.repository
+ repository.add_branch(branch_name, ref)
+ new_branch = repository.find_branch(branch_name)
+
+ if new_branch
+ Event.create_ref_event(project, current_user, new_branch, 'add')
+ end
+
+ new_branch
+ end
+end
--
GitLab