diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2007-03-29 18:14:59 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2007-03-29 18:14:59 +0000 |
| commit | 2b70760594f268800e9a4f95a914bc23b86d2bd9 (patch) | |
| tree | ff72be79fa3a23400c83b9e1bb78b444534521fc /app/controllers/repositories_controller.rb | |
| parent | d8ce97f766654fde6a887cd4feeb0c1f42ad8974 (diff) | |
| download | redmine-2b70760594f268800e9a4f95a914bc23b86d2bd9.tar.gz redmine-2b70760594f268800e9a4f95a914bc23b86d2bd9.zip | |
patch #9627 Add Side by Side in Diff view (Cyril Mougel)
git-svn-id: http://redmine.rubyforge.org/svn/trunk@390 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers/repositories_controller.rb')
| -rw-r--r-- | app/controllers/repositories_controller.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb index 9bc9a9062..f961049be 100644 --- a/app/controllers/repositories_controller.rb +++ b/app/controllers/repositories_controller.rb @@ -74,7 +74,8 @@ class RepositoriesController < ApplicationController def diff @rev_to = params[:rev_to] || (@rev-1) - @diff = @repository.scm.diff(params[:path], @rev, @rev_to) + type = params[:type] || 'inline' + @diff = @repository.scm.diff(params[:path], @rev, @rev_to, type) show_error and return unless @diff end @@ -204,4 +205,4 @@ class Date def weeks_ago(date = Date.today) (date.year - self.year)*52 + (date.cweek - self.cweek) end -end
\ No newline at end of file +end |