2012-05-31 12:16:34 +01:00
|
|
|
#diff.tab-pane
|
2012-06-08 09:28:23 +01:00
|
|
|
.leftside
|
|
|
|
|
-total_additions = @stats.inject(0) {|sum, n| sum + n.additions}
|
|
|
|
|
-total_deletions = @stats.inject(0) {|sum, n| sum + n.deletions}
|
|
|
|
|
%h5= t("layout.projects.diff_show_header",
|
|
|
|
|
:files => t("layout.projects.commit_files_count", :count => @stats.count),
|
|
|
|
|
:additions => t("layout.projects.commit_additions_count", :count => total_additions),
|
|
|
|
|
:deletions => t("layout.projects.commit_deletions_count", :count => total_deletions))
|
|
|
|
|
.both
|
|
|
|
|
-begin
|
|
|
|
|
= render_diff_stats(@stats)
|
2012-10-26 15:03:46 +01:00
|
|
|
= render :partial => 'pull_diff', :collection => @pull.diff
|
|
|
|
|
- rescue => ex
|
|
|
|
|
-if ex.try(:message) == 'Grit::Git::GitTimeout'
|
|
|
|
|
%p= t 'layout.git.repositories.commit_diff_too_big'
|
|
|
|
|
-else
|
|
|
|
|
-raise ex
|
2012-05-31 12:16:34 +01:00
|
|
|
#commits.tab-pane
|
2012-09-26 18:00:58 +01:00
|
|
|
- if @total_commits > @commits.count
|
|
|
|
|
%div= t("projects.pull_requests.is_big", :count => @commits.count)
|
2012-05-31 12:16:34 +01:00
|
|
|
= render :partial => 'projects/git/commits/commits', :object => @commits
|
