summaryrefslogtreecommitdiff
path: root/app/controllers/projects/commit_controller.rb
diff options
context:
space:
mode:
authorPaco Guzman <pacoguzmanp@gmail.com>2016-07-21 11:47:27 +0200
committerPaco Guzman <pacoguzmanp@gmail.com>2016-07-21 14:31:51 +0200
commit37d2919186e2e03894b82a262d08afd2eb012a36 (patch)
treebb47ef9f2c28444d36dbfdc4a40f30b0ec8d2479 /app/controllers/projects/commit_controller.rb
parentcb07541681a5961b40a7a17c9b93683cd8d59a8f (diff)
downloadgitlab-ce-20034-phase-2.tar.gz
Use SafeDiffs everywhere20034-phase-2
Diffstat (limited to 'app/controllers/projects/commit_controller.rb')
-rw-r--r--app/controllers/projects/commit_controller.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/app/controllers/projects/commit_controller.rb b/app/controllers/projects/commit_controller.rb
index 727e84b40a1..d226e3dc40c 100644
--- a/app/controllers/projects/commit_controller.rb
+++ b/app/controllers/projects/commit_controller.rb
@@ -28,10 +28,11 @@ class Projects::CommitController < Projects::ApplicationController
end
def diff_for_path
- render_diff_for_path(@diffs, @commit.diff_refs, @project)
+ render_diff_for_path(SafeDiffs::Commit.new(@commit, diff_options: diff_options))
end
def builds
+ # TODO only needs diffs.count from diffs
end
def cancel_builds
@@ -110,7 +111,7 @@ class Projects::CommitController < Projects::ApplicationController
opts = diff_options
opts[:ignore_whitespace_change] = true if params[:format] == 'diff'
- @diffs = commit.diffs(opts)
+ @diffs = SafeDiffs::Commit.new(commit, diff_options: opts)
@notes_count = commit.notes.count
end