summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMateusz Bajorski <ematib@gmail.com>2017-12-27 18:58:46 +0100
committerMateusz Bajorski <ematib@gmail.com>2017-12-27 18:58:46 +0100
commitac1b353e43b739fd946fe047f4407ecb96c17ec6 (patch)
tree7cbd929790d3e8e869254ef41065abe0cf2232ae
parent896b9a6828b798ce796e0697cfa878c39c7ef829 (diff)
downloadgitlab-ce-ac1b353e43b739fd946fe047f4407ecb96c17ec6.tar.gz
Refactor success status in branch controller
-rw-r--r--app/controllers/projects/branches_controller.rb8
1 files changed, 5 insertions, 3 deletions
diff --git a/app/controllers/projects/branches_controller.rb b/app/controllers/projects/branches_controller.rb
index e8e9f45edee..cabafe26357 100644
--- a/app/controllers/projects/branches_controller.rb
+++ b/app/controllers/projects/branches_controller.rb
@@ -46,14 +46,16 @@ class Projects::BranchesController < Projects::ApplicationController
result = CreateBranchService.new(project, current_user)
.execute(branch_name, ref)
- if params[:issue_iid] && result[:status] == :success
+ success = (result[:status] == :success)
+
+ if params[:issue_iid] && success
issue = IssuesFinder.new(current_user, project_id: @project.id).find_by(iid: params[:issue_iid])
SystemNoteService.new_issue_branch(issue, @project, current_user, branch_name) if issue
end
respond_to do |format|
format.html do
- if result[:status] == :success
+ if success
if redirect_to_autodeploy
redirect_to url_to_autodeploy_setup(project, branch_name),
notice: view_context.autodeploy_flash_notice(branch_name)
@@ -67,7 +69,7 @@ class Projects::BranchesController < Projects::ApplicationController
end
format.json do
- if result[:status] == :success
+ if success
render json: { name: branch_name, url: project_tree_url(@project, branch_name) }
else
render json: result[:messsage], status: :unprocessable_entity