Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app/controllers/projects/compare_controller.rb')
-rw-r--r--app/controllers/projects/compare_controller.rb11
1 files changed, 9 insertions, 2 deletions
diff --git a/app/controllers/projects/compare_controller.rb b/app/controllers/projects/compare_controller.rb
index 746ca6568f8..91793cc3650 100644
--- a/app/controllers/projects/compare_controller.rb
+++ b/app/controllers/projects/compare_controller.rb
@@ -27,8 +27,8 @@ class Projects::CompareController < Projects::ApplicationController
def create
if params[:from].blank? || params[:to].blank?
flash[:alert] = "You must select from and to branches"
- byebug
- redirect_to namespace_project_compare_index_path
+ from_to_preservation = from_to_hash(params)
+ redirect_to namespace_project_compare_index_path(@project.namespace, @project, from_to_preservation)
else
redirect_to namespace_project_compare_path(@project.namespace, @project,
params[:from], params[:to])
@@ -62,4 +62,11 @@ class Projects::CompareController < Projects::ApplicationController
@merge_request ||= MergeRequestsFinder.new(current_user, project_id: @project.id).execute.opened.
find_by(source_project: @project, source_branch: @head_ref, target_branch: @start_ref)
end
+
+ def from_to_hash(params)
+ return_hash = {}
+ return_hash[:from] = params[:from].presence
+ return_hash[:to] = params[:to].presence
+ return_hash
+ end
end