Commit 1022a167 authored by Sean McGivern's avatar Sean McGivern

Limit push email diff size

Limit push email diff size to 30 files or 150 KB, whichever comes first.
parent f011b86b
...@@ -48,6 +48,7 @@ v 8.9.0 (unreleased) ...@@ -48,6 +48,7 @@ v 8.9.0 (unreleased)
- Add `sha` parameter to MR merge API, to ensure only reviewed changes are merged - 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 - Don't allow MRs to be merged when commits were added since the last review / page load
- Add DB index on users.state - 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 - 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) - Changed the Slack build message to use the singular duration if necessary (Aran Koning)
- Fix race condition on merge when build succeeds - Fix race condition on merge when build succeeds
......
...@@ -37,7 +37,7 @@ module Gitlab ...@@ -37,7 +37,7 @@ module Gitlab
end end
def diffs 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 end
def diffs_count def diffs_count
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment