diff options
Diffstat (limited to 'app/controllers/projects/compare_controller.rb')
| -rw-r--r-- | app/controllers/projects/compare_controller.rb | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/app/controllers/projects/compare_controller.rb b/app/controllers/projects/compare_controller.rb index d7fd65f02a8..61308f24412 100644 --- a/app/controllers/projects/compare_controller.rb +++ b/app/controllers/projects/compare_controller.rb @@ -47,7 +47,8 @@ class Projects::CompareController < Projects::ApplicationController from_to_vars = { from: compare_params[:from].presence, to: compare_params[:to].presence, - from_project_id: compare_params[:from_project_id].presence + from_project_id: compare_params[:from_project_id].presence, + straight: compare_params[:straight].presence } if from_to_vars[:from].blank? || from_to_vars[:to].blank? @@ -112,7 +113,11 @@ class Projects::CompareController < Projects::ApplicationController def compare return @compare if defined?(@compare) - @compare = CompareService.new(source_project, head_ref).execute(target_project, start_ref) + @compare = CompareService.new(source_project, head_ref).execute(target_project, start_ref, straight: straight) + end + + def straight + compare_params[:straight] == "true" end def start_ref @@ -160,6 +165,6 @@ class Projects::CompareController < Projects::ApplicationController # rubocop: enable CodeReuse/ActiveRecord def compare_params - @compare_params ||= params.permit(:from, :to, :from_project_id) + @compare_params ||= params.permit(:from, :to, :from_project_id, :straight) end end |