summaryrefslogtreecommitdiffstats
path: root/app/controllers
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2008-06-08 16:28:42 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2008-06-08 16:28:42 +0000
commitec0525d4975b9cae9982695cb0a19ac9c4bd1a3c (patch)
treed1f1afa7c69e6fde7c830f338b34fc49d4af56a2 /app/controllers
parent731d15fe9b29a28362fff19ed7dad9df2516d73b (diff)
downloadredmine-ec0525d4975b9cae9982695cb0a19ac9c4bd1a3c.tar.gz
redmine-ec0525d4975b9cae9982695cb0a19ac9c4bd1a3c.zip
Move unified diff parser out of the scm abstract adapter so it can be reused for viewing attached diffs (#1403).
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1513 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/repositories_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index ea3b117d9..5fb2fdd75 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -153,7 +153,7 @@ class RepositoriesController < ApplicationController
@cache_key = "repositories/diff/#{@repository.id}/" + Digest::MD5.hexdigest("#{@path}-#{@rev}-#{@rev_to}-#{@diff_type}")
unless read_fragment(@cache_key)
- @diff = @repository.diff(@path, @rev, @rev_to, @diff_type)
+ @diff = @repository.diff(@path, @rev, @rev_to)
show_error_not_found unless @diff
end
rescue Redmine::Scm::Adapters::CommandFailed => e