Download as
Browse Code »

Commit 6347e9a60bd3c00a6a6616756ecc398079775fb2

Authored by Dmitriy Zaporozhets
1 parent 72db22d3
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Dont load diff in compare over 100 commits

Showing 2 changed files with 14 additions and 1 deletions   Show diff stats
app/models/commit.rb
  Diff comments   View file @6347e9a
@@ -89,7 +89,14 @@ class Commit @@ -89,7 +89,14 @@ class Commit
89 if first && last 89 if first && last
90 result[:same] = (first.id == last.id) 90 result[:same] = (first.id == last.id)
91 result[:commits] = project.repo.commits_between(last.id, first.id).map {|c| Commit.new(c)} 91 result[:commits] = project.repo.commits_between(last.id, first.id).map {|c| Commit.new(c)}
92 - result[:diffs] = project.repo.diff(last.id, first.id) rescue [] 92 +
  93 + # Dont load diff for 100+ commits
  94 + result[:diffs] = if result[:commits].size > 100
  95 + []
  96 + else
  97 + project.repo.diff(last.id, first.id) rescue []
  98 + end
  99 +
93 result[:commit] = Commit.new(first) 100 result[:commit] = Commit.new(first)
94 end 101 end
95 102
app/views/compare/show.html.haml
  Diff comments   View file @6347e9a
@@ -6,6 +6,12 @@ @@ -6,6 +6,12 @@
6 6
7 = render "form" 7 = render "form"
8 8
  9 +- if @commits.size > 100
  10 + .alert.alert-block
  11 + %p
  12 + %strong Warning! This comparison include 100+ commits.
  13 + %p To prevent performance issue we dont show diff information.
  14 +
9 - if @commits.present? 15 - if @commits.present?
10 %div.ui-box 16 %div.ui-box
11 %h5.title 17 %h5.title