diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-07-15 21:28:03 +0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-07-15 21:28:03 +0400 |
| commit | 2d6c4d2bb05e52731877ad17a0a78d0d3609ebcc (patch) | |
| tree | cb999279f07839c0b6c65244b1704101ba6f4957 /features | |
| parent | d1001e3d98ec294db60f08762c5006e8a8f8c98f (diff) | |
| parent | 1d5965267b83f84d00efcddc624813b010e6510a (diff) | |
Merge branch 'fix-huge-mr' into 'master'
Fix huge merge requests
* Refactored suppress logic for diffs
* Increase grit memory limit (should mix most of 502 errors when create MR)
* show first 100 files for huge diffs
Fixes #1424
See merge request !970
Diffstat (limited to 'features')
| -rw-r--r-- | features/steps/project/browse_commits.rb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/features/steps/project/browse_commits.rb b/features/steps/project/browse_commits.rb index bd944dee610..fe47a731915 100644 --- a/features/steps/project/browse_commits.rb +++ b/features/steps/project/browse_commits.rb @@ -61,8 +61,7 @@ class ProjectBrowseCommits < Spinach::FeatureSteps Then 'I see big commit warning' do page.should have_content BigCommits::BIG_COMMIT_MESSAGE - page.should have_content "Warning! This is a large diff" - page.should have_content "If you still want to see the diff" + page.should have_content "Too many changes" end Given 'I visit huge commit page' do @@ -71,8 +70,6 @@ class ProjectBrowseCommits < Spinach::FeatureSteps Then 'I see huge commit message' do page.should have_content BigCommits::HUGE_COMMIT_MESSAGE - page.should have_content "Warning! This is a large diff" - page.should_not have_content "If you still want to see the diff" end Given 'I visit a commit with an image that changed' do |