diff options
| author | Go MAEDA <maeda@farend.jp> | 2023-04-29 06:59:40 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2023-04-29 06:59:40 +0000 |
| commit | 90569a4ed05bd5fa6398d7101609a81b2098a5b5 (patch) | |
| tree | 76841af197a3cdcc4cf5ec6b8c3b8c264ebcf875 /app | |
| parent | be48f43223c7aea02067d585e67b15b9ce0fa93d (diff) | |
| download | redmine-90569a4ed05bd5fa6398d7101609a81b2098a5b5.tar.gz redmine-90569a4ed05bd5fa6398d7101609a81b2098a5b5.zip | |
Code cleanup of RepositoriesController#annotate (#35432).
git-svn-id: https://svn.redmine.org/redmine/trunk@22215 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/repositories_controller.rb | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb index 0e83bfa1e..c143ed233 100644 --- a/app/controllers/repositories_controller.rb +++ b/app/controllers/repositories_controller.rb @@ -202,18 +202,12 @@ class RepositoriesController < ApplicationController (show_error_not_found; return) unless @entry @annotate = @repository.scm.annotate(@path, @rev) - if @annotate.nil? || @annotate.empty? + if @annotate.blank? @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 + elsif @annotate.lines.sum(&:size) > Setting.file_max_size_displayed.to_i.kilobyte + @annotate = nil + @error_message = l(:error_scm_annotate_big_text_file) end @changeset = @repository.find_changeset_by_name(@rev) end |