summaryrefslogtreecommitdiff
path: root/app/controllers
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2016-08-03 09:32:01 -0700
committerDouwe Maan <douwe@selenight.nl>2016-08-03 09:32:01 -0700
commitc008a1a9674f7c01b4504e22ed414b07eff05385 (patch)
treedaf83460eaf0f1a470a8f07b0b132c3cf12a566b /app/controllers
parentc86c1905b5574cac234315598d8d715fcaee3ea7 (diff)
downloadgitlab-ce-c008a1a9674f7c01b4504e22ed414b07eff05385.tar.gz
Make Compare#diffs diff_options a regular argument
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/projects/compare_controller.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/projects/compare_controller.rb b/app/controllers/projects/compare_controller.rb
index 4a42a7d091b..bee3d56076c 100644
--- a/app/controllers/projects/compare_controller.rb
+++ b/app/controllers/projects/compare_controller.rb
@@ -21,7 +21,7 @@ class Projects::CompareController < Projects::ApplicationController
def diff_for_path
return render_404 unless @compare
- render_diff_for_path(@compare.diffs(diff_options: diff_options))
+ render_diff_for_path(@compare.diffs(diff_options))
end
def create
@@ -45,7 +45,7 @@ class Projects::CompareController < Projects::ApplicationController
@commit = @compare.commit
@base_commit = @compare.base_commit
- @diffs = @compare.diffs(diff_options: diff_options)
+ @diffs = @compare.diffs(diff_options)
@diff_notes_disabled = true
@grouped_diff_discussions = {}