From 1db54e228d98d20536133bf52a8af0ce67616dc3 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sun, 17 Jul 2016 09:22:42 +0000 Subject: Don't respond with the error template when annotate is not available. git-svn-id: http://svn.redmine.org/redmine/trunk@15694 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/controllers/repositories_controller.rb | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'app/controllers') diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb index 9bee5b837..07f1db0b4 100644 --- a/app/controllers/repositories_controller.rb +++ b/app/controllers/repositories_controller.rb @@ -211,14 +211,17 @@ class RepositoriesController < ApplicationController @annotate = @repository.scm.annotate(@path, @rev) if @annotate.nil? || @annotate.empty? - (render_error l(:error_scm_annotate); return) - end - ann_buf_size = 0 - @annotate.lines.each do |buf| - ann_buf_size += buf.size - end - if ann_buf_size > Setting.file_max_size_displayed.to_i.kilobyte - (render_error l(:error_scm_annotate_big_text_file); return) + @annotate = nil + @error_message = l(:error_scm_annotate) + else + ann_buf_size = 0 + @annotate.lines.each do |buf| + ann_buf_size += buf.size + end + if ann_buf_size > Setting.file_max_size_displayed.to_i.kilobyte + @annotate = nil + @error_message = l(:error_scm_annotate_big_text_file) + end end @changeset = @repository.find_changeset_by_name(@rev) end -- cgit v1.2.3