diff options
| author | Boyan Tabakov <boyan.tabakov@futurice.com> | 2013-09-04 10:33:09 +0300 |
|---|---|---|
| committer | Boyan Tabakov <boyan.tabakov@futurice.com> | 2013-09-07 14:44:03 +0300 |
| commit | 01ff084a4df76ba0856a513aca9bdf8f1d550365 (patch) | |
| tree | d90ef89169f4e53dc702172b3f3b01a030619549 /features/support | |
| parent | 71d31a38fc73252a76076820c63d054a8047d667 (diff) | |
| download | gitlab-ce-01ff084a4df76ba0856a513aca9bdf8f1d550365.tar.gz | |
Improved large commit handling.
Previously, only number of changed files mattered. Now, number of lines to render in the diff are also taken into account.
A hard limit is set, above which diffs are not rendered and users are not allowed to override that. This prevents high server
resource usage with huge commits.
Related to #1745, #2259
In addition, handle large commits for MergeRequests and Compare controllers.
Also fixes a bug where diffs are loaded twice, if user goes directly to merge_requests/:id/diffs URL.
Diffstat (limited to 'features/support')
| -rw-r--r-- | features/support/env.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/features/support/env.rb b/features/support/env.rb index 0cc7d8d2fe9..61f8dc29670 100644 --- a/features/support/env.rb +++ b/features/support/env.rb @@ -14,7 +14,7 @@ require 'spinach/capybara' require 'sidekiq/testing/inline' -%w(valid_commit select2_helper chosen_helper test_env).each do |f| +%w(valid_commit big_commits select2_helper chosen_helper test_env).each do |f| require Rails.root.join('spec', 'support', f) end |