summaryrefslogtreecommitdiffstats
path: root/app/controllers/repositories_controller.rb
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2007-11-04 11:20:21 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2007-11-04 11:20:21 +0000
commitd46e3a501e7bad4242d896de36f02c19b8781143 (patch)
tree85fb8a12da0ad944ede83fff3123954d960bf760 /app/controllers/repositories_controller.rb
parentd4e47d5d649844aa2d29b79334946cf4765c8482 (diff)
downloadredmine-d46e3a501e7bad4242d896de36f02c19b8781143.tar.gz
redmine-d46e3a501e7bad4242d896de36f02c19b8781143.zip
Pretty URL for the repository browser (Cyril Mougel)
git-svn-id: http://redmine.rubyforge.org/svn/trunk@880 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers/repositories_controller.rb')
-rw-r--r--app/controllers/repositories_controller.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index 945cb2623..235754770 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -110,7 +110,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, type)
+ @diff = @repository.diff(@path, @rev, @rev_to, @diff_type)
show_error and return unless @diff
end
end
@@ -145,7 +145,7 @@ private
@project = Project.find(params[:id])
@repository = @project.repository
render_404 and return false unless @repository
- @path = params[:path].squeeze('/') if params[:path]
+ @path = params[:path].join('/') unless params[:path].nil?
@path ||= ''
@rev = params[:rev].to_i if params[:rev]
rescue ActiveRecord::RecordNotFound