summaryrefslogtreecommitdiff
path: root/app/views/projects/compare/show.html.haml
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-02-05 15:54:51 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-02-05 15:54:51 +0200
commit68249f23dacbddf61ca296a7decf98ecf6fc16fb (patch)
treeee71906a02468a137413751e70feb908ae19a4d2 /app/views/projects/compare/show.html.haml
parentd701d5869516142a4073804622503299202cfbe2 (diff)
downloadgitlab-ce-68249f23dacbddf61ca296a7decf98ecf6fc16fb.tar.gz
Prevent Compare page timout for large amount of commits
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/views/projects/compare/show.html.haml')
-rw-r--r--app/views/projects/compare/show.html.haml9
1 files changed, 8 insertions, 1 deletions
diff --git a/app/views/projects/compare/show.html.haml b/app/views/projects/compare/show.html.haml
index e9456c24960..6b0b12a3ee0 100644
--- a/app/views/projects/compare/show.html.haml
+++ b/app/views/projects/compare/show.html.haml
@@ -15,7 +15,14 @@
%div.ui-box
.title
Commits (#{@commits.count})
- %ul.well-list= render Commit.decorate(@commits), project: @project
+ - if @commits.size > MergeRequestDiff::COMMITS_SAFE_SIZE
+ %ul.well-list
+ - Commit.decorate(@commits.first(MergeRequestDiff::COMMITS_SAFE_SIZE)).each do |commit|
+ = render "projects/commits/inline_commit", commit: commit, project: @project
+ %li.warning-row.unstyled
+ other #{@commits.size - MergeRequestDiff::COMMITS_SAFE_SIZE} commits hidden to prevent performance issues.
+ - else
+ %ul.well-list= render Commit.decorate(@commits), project: @project
- unless @diffs.empty?
%h4 Diff