annotate .svn/pristine/a0/a04a5d71b977f3b565534fb7037f1a2f881f34aa.svn-base @ 1628:9c5f8e24dadc live tip

Quieten this cron script
author Chris Cannam
date Tue, 25 Aug 2020 11:38:49 +0100
parents cbb26bc654de
children
rev   line source
Chris@909 1 Index: app/views/settings/_general.rhtml
Chris@909 2 ===================================================================
Chris@909 3 --- app/views/settings/_general.rhtml (revision 2094)
Chris@909 4 +++ app/views/settings/_general.rhtml (working copy)
Chris@909 5 @@ -48,6 +48,9 @@
Chris@909 6 <p><label><%= l(:setting_feeds_limit) %></label>
Chris@909 7 <%= text_field_tag 'settings[feeds_limit]', Setting.feeds_limit, :size => 6 %></p>
Chris@909 8
Chris@909 9 +<p><label><%= l(:setting_diff_max_lines_displayed) %></label>
Chris@909 10 +<%= text_field_tag 'settings[diff_max_lines_displayed]', Setting.diff_max_lines_displayed, :size => 6 %></p>
Chris@909 11 +
Chris@909 12 <p><label><%= l(:setting_gravatar_enabled) %></label>
Chris@909 13 <%= check_box_tag 'settings[gravatar_enabled]', 1, Setting.gravatar_enabled? %><%= hidden_field_tag 'settings[gravatar_enabled]', 0 %></p>
Chris@909 14 </div>
Chris@909 15 Index: app/views/common/_diff.rhtml
Chris@909 16 ===================================================================
Chris@909 17 --- app/views/common/_diff.rhtml (revision 2111)
Chris@909 18 +++ app/views/common/_diff.rhtml (working copy)
Chris@909 19 @@ -1,4 +1,5 @@
Chris@909 20 -<% Redmine::UnifiedDiff.new(diff, :type => diff_type).each do |table_file| -%>
Chris@909 21 +<% diff = Redmine::UnifiedDiff.new(diff, :type => diff_type, :max_lines => Setting.diff_max_lines_displayed.to_i) -%>
Chris@909 22 +<% diff.each do |table_file| -%>
Chris@909 23 <div class="autoscroll">
Chris@909 24 <% if diff_type == 'sbs' -%>
Chris@909 25 <table class="filecontent syntaxhl">
Chris@909 26 @@ -62,3 +63,5 @@
Chris@909 27
Chris@909 28 </div>
Chris@909 29 <% end -%>
Chris@909 30 +
Chris@909 31 +<%= l(:text_diff_truncated) if diff.truncated? %>
Chris@909 32 Index: lang/lt.yml
Chris@909 33 ===================================================================
Chris@909 34 --- config/settings.yml (revision 2094)
Chris@909 35 +++ config/settings.yml (working copy)
Chris@909 36 @@ -61,6 +61,9 @@
Chris@909 37 feeds_limit:
Chris@909 38 format: int
Chris@909 39 default: 15
Chris@909 40 +diff_max_lines_displayed:
Chris@909 41 + format: int
Chris@909 42 + default: 1500
Chris@909 43 enabled_scm:
Chris@909 44 serialized: true
Chris@909 45 default:
Chris@909 46 Index: lib/redmine/unified_diff.rb
Chris@909 47 ===================================================================
Chris@909 48 --- lib/redmine/unified_diff.rb (revision 2110)
Chris@909 49 +++ lib/redmine/unified_diff.rb (working copy)
Chris@909 50 @@ -19,8 +19,11 @@
Chris@909 51 # Class used to parse unified diffs
Chris@909 52 class UnifiedDiff < Array
Chris@909 53 def initialize(diff, options={})
Chris@909 54 + options.assert_valid_keys(:type, :max_lines)
Chris@909 55 diff_type = options[:type] || 'inline'
Chris@909 56
Chris@909 57 + lines = 0
Chris@909 58 + @truncated = false
Chris@909 59 diff_table = DiffTable.new(diff_type)
Chris@909 60 diff.each do |line|
Chris@909 61 if line =~ /^(---|\+\+\+) (.*)$/
Chris@909 62 @@ -28,10 +31,17 @@
Chris@909 63 diff_table = DiffTable.new(diff_type)
Chris@909 64 end
Chris@909 65 diff_table.add_line line
Chris@909 66 + lines += 1
Chris@909 67 + if options[:max_lines] && lines > options[:max_lines]
Chris@909 68 + @truncated = true
Chris@909 69 + break
Chris@909 70 + end
Chris@909 71 end
Chris@909 72 self << diff_table unless diff_table.empty?
Chris@909 73 self
Chris@909 74 end
Chris@909 75 +
Chris@909 76 + def truncated?; @truncated; end
Chris@909 77 end
Chris@909 78
Chris@909 79 # Class that represents a file diff