Mercurial > hg > soundsoftware-site
diff app/controllers/.svn/text-base/repositories_controller.rb.svn-base @ 508:851510f1b535 cannam
Merge from branch "redmine-1.2"
author | Chris Cannam |
---|---|
date | Thu, 14 Jul 2011 10:37:36 +0100 |
parents | 753f1380d6bc 0c939c159af4 |
children |
line wrap: on
line diff
--- a/app/controllers/.svn/text-base/repositories_controller.rb.svn-base Thu Jul 14 10:21:43 2011 +0100 +++ b/app/controllers/.svn/text-base/repositories_controller.rb.svn-base Thu Jul 14 10:37:36 2011 +0100 @@ -30,7 +30,7 @@ before_filter :find_repository, :except => :edit before_filter :find_project, :only => :edit before_filter :authorize - accept_key_auth :revisions + accept_rss_auth :revisions rescue_from Redmine::Scm::Adapters::CommandFailed, :with => :show_error_command_failed @@ -208,7 +208,7 @@ User.current.preference.save end @cache_key = "repositories/diff/#{@repository.id}/" + - Digest::MD5.hexdigest("#{@path}-#{@rev}-#{@rev_to}-#{@diff_type}") + Digest::MD5.hexdigest("#{@path}-#{@rev}-#{@rev_to}-#{@diff_type}-#{current_language}") unless read_fragment(@cache_key) @diff = @repository.diff(@path, @rev, @rev_to) show_error_not_found unless @diff