summaryrefslogtreecommitdiffstats
path: root/app/views/common/_diff.rhtml
diff options
context:
space:
mode:
Diffstat (limited to 'app/views/common/_diff.rhtml')
-rw-r--r--app/views/common/_diff.rhtml5
1 files changed, 4 insertions, 1 deletions
diff --git a/app/views/common/_diff.rhtml b/app/views/common/_diff.rhtml
index 07bd4745f..104845b4d 100644
--- a/app/views/common/_diff.rhtml
+++ b/app/views/common/_diff.rhtml
@@ -1,4 +1,5 @@
-<% Redmine::UnifiedDiff.new(diff, :type => diff_type).each do |table_file| -%>
+<% diff = Redmine::UnifiedDiff.new(diff, :type => diff_type, :max_lines => Setting.diff_max_lines_displayed.to_i) -%>
+<% diff.each do |table_file| -%>
<div class="autoscroll">
<% if diff_type == 'sbs' -%>
<table class="filecontent CodeRay">
@@ -62,3 +63,5 @@
</div>
<% end -%>
+
+<%= l(:text_diff_truncated) if diff.truncated? %>