Merge remote-tracking branch 'upstream/master' into new-issue-by-email

* upstream/master: (1547 commits)
  Add margin between buttons if both retry and cancel are present
  Add margin between labels; remove underline hover style on status button
  udpated JS based on feedback
  Use default cursor for table header of project files (!5165)
  Fix duplicated entry in changelog [ci skip]
  Improves left static sidebar behaviour
  Include default callback URL (OAuth)
  Cleanup feature proposal template
  Simplify regex for string-based multi-word label surrounded in quotes
  Revert "Merge branch '18193-developers-can-merge' into 'master'
"
  Upgrade Rails from 4.2.6 to 4.2.7.
  some JS magic to fix empty URL bug
  formats my test properly
  Update CHANGELOG
  Doesn't match empty label references surrounded in quotes
  Fix markdown rendering for label references that contains `.`
  Fix markdown rendering for label references that begin with a digit
  Fix markdown rendering for consecutive label references
  Stub omniauth provider for GitLab
  Update CHANGELOG
  ...

1 files changed, 6 insertions, 2 deletions

diff --git a/lib/gitlab/email/message/repository_push.rb b/lib/gitlab/email/message/repository_push.rb
index e2fee6b9f3e..97701b0cd42 100644
--- a/lib/gitlab/email/message/repository_push.rb
+++ b/lib/gitlab/email/message/repository_push.rb
@@ -33,11 +33,15 @@ module Gitlab
         end
 
         def commits
-          @commits ||= (Commit.decorate(compare.commits, project) if compare)
+          return unless compare
+
+          @commits ||= Commit.decorate(compare.commits, project)
         end
 
         def diffs
-          @diffs ||= (safe_diff_files(compare.diffs, diff_refs) if compare)
+          return unless compare
+          
+          @diffs ||= safe_diff_files(compare.diffs(max_files: 30), diff_refs: diff_refs, repository: project.repository)
         end
 
         def diffs_count