summaryrefslogtreecommitdiffstats
path: root/app/controllers
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2008-03-12 20:28:49 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2008-03-12 20:28:49 +0000
commit3a9b0988c7515371531e47f9eef9f8e60ce352aa (patch)
tree2a2deaedbd321dcf838c631dfed357f3c1110dbe /app/controllers
parent6fcc512cb77a0851ab8c3c693fd178b564a600dd (diff)
downloadredmine-3a9b0988c7515371531e47f9eef9f8e60ce352aa.tar.gz
redmine-3a9b0988c7515371531e47f9eef9f8e60ce352aa.zip
Merged Git support branch (r1200 to r1226).
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1236 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers')
-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 13d3eaa32..bce5f66a9 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -134,7 +134,7 @@ class RepositoriesController < ApplicationController
end
def diff
- @rev_to = params[:rev_to] ? params[:rev_to].to_i : (@rev - 1)
+ @rev_to = params[:rev_to]
@diff_type = params[:type] || User.current.pref[:diff_type] || 'inline'
@diff_type = 'inline' unless %w(inline sbs).include?(@diff_type)
@@ -185,7 +185,7 @@ private
render_404 and return false unless @repository
@path = params[:path].join('/') unless params[:path].nil?
@path ||= ''
- @rev = params[:rev].to_i if params[:rev]
+ @rev = params[:rev]
rescue ActiveRecord::RecordNotFound
render_404
end