diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-07-15 17:28:03 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-07-15 17:28:03 +0000 |
| commit | 2d6c4d2bb05e52731877ad17a0a78d0d3609ebcc (patch) | |
| tree | cb999279f07839c0b6c65244b1704101ba6f4957 /app/models/merge_request.rb | |
| parent | d1001e3d98ec294db60f08762c5006e8a8f8c98f (diff) | |
| parent | 1d5965267b83f84d00efcddc624813b010e6510a (diff) | |
| download | gitlab-ce-2d6c4d2bb05e52731877ad17a0a78d0d3609ebcc.tar.gz | |
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 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 597e02d498b..28486fb41c6 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -42,6 +42,11 @@ class MergeRequest < ActiveRecord::Base # It allows us to close or modify broken merge requests attr_accessor :allow_broken + # Temporary fields to store compare vars + # when creating new merge request + attr_accessor :can_be_created, :compare_failed, :compare_base_commit, + :compare_commits, :compare_diffs + ActsAsTaggableOn.strict_case_match = true acts_as_taggable_on :labels |