diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-04-20 00:37:44 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-04-20 00:37:44 +0000 |
| commit | d170133bded904603833f1b9e2727def3805962d (patch) | |
| tree | a1c1e1f9973b43a5ff2482d4e1b91b219c5ac3af /app/controllers/projects/commit_controller.rb | |
| parent | bfb635a4afea60751a44e6454f9c36850b5342c9 (diff) | |
| download | gitlab-ce-d170133bded904603833f1b9e2727def3805962d.tar.gz | |
Refactor changing files in web UI
Diffstat (limited to 'app/controllers/projects/commit_controller.rb')
| -rw-r--r-- | app/controllers/projects/commit_controller.rb | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/app/controllers/projects/commit_controller.rb b/app/controllers/projects/commit_controller.rb index d25bbddd1bb..2b5f0383ac1 100644 --- a/app/controllers/projects/commit_controller.rb +++ b/app/controllers/projects/commit_controller.rb @@ -56,9 +56,7 @@ class Projects::CommitController < Projects::ApplicationController return render_404 if @start_branch.blank? - @target_branch = create_new_branch? ? @commit.revert_branch_name : @start_branch - - @mr_target_branch = @start_branch + @branch_name = create_new_branch? ? @commit.revert_branch_name : @start_branch create_commit(Commits::RevertService, success_notice: "The #{@commit.change_type_title(current_user)} has been successfully reverted.", success_path: -> { successful_change_path }, failure_path: failed_change_path) @@ -69,9 +67,7 @@ class Projects::CommitController < Projects::ApplicationController return render_404 if @start_branch.blank? - @target_branch = create_new_branch? ? @commit.cherry_pick_branch_name : @start_branch - - @mr_target_branch = @start_branch + @branch_name = create_new_branch? ? @commit.cherry_pick_branch_name : @start_branch create_commit(Commits::CherryPickService, success_notice: "The #{@commit.change_type_title(current_user)} has been successfully cherry-picked.", success_path: -> { successful_change_path }, failure_path: failed_change_path) @@ -84,7 +80,7 @@ class Projects::CommitController < Projects::ApplicationController end def successful_change_path - referenced_merge_request_url || namespace_project_commits_url(@project.namespace, @project, @target_branch) + referenced_merge_request_url || namespace_project_commits_url(@project.namespace, @project, @branch_name) end def failed_change_path |