Limit push email diff size

Limit push email diff size to 30 files or 150 KB, whichever comes first.
This commit is contained in:
Sean McGivern 2016-06-17 08:55:05 +01:00
parent f011b86beb
commit 1022a1678b
2 changed files with 2 additions and 1 deletions

View File

@ -48,6 +48,7 @@ v 8.9.0 (unreleased)
- Add `sha` parameter to MR merge API, to ensure only reviewed changes are merged
- Don't allow MRs to be merged when commits were added since the last review / page load
- Add DB index on users.state
- Limit email on push diff size to 30 files / 150 KB
- Add rake task 'gitlab:db:configure' for conditionally seeding or migrating the database
- Changed the Slack build message to use the singular duration if necessary (Aran Koning)
- Fix race condition on merge when build succeeds

View File

@ -37,7 +37,7 @@ module Gitlab
end
def diffs
@diffs ||= (safe_diff_files(compare.diffs, diff_refs) if compare)
@diffs ||= (safe_diff_files(compare.diffs(max_files: 30), diff_refs) if compare)
end
def diffs_count