diff options
| author | Sean McGivern <sean@gitlab.com> | 2016-08-26 10:54:19 +0100 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2016-09-07 16:00:26 +0100 |
| commit | 24424d932f10c1a498a77d742d5ffd6ae18c506d (patch) | |
| tree | 6c34abf9d40253ef86b27b9c3f7c77b96c7d4a56 /lib/gitlab/conflict/parser.rb | |
| parent | f7b64a46161337cf8c2d8a5cb8c154ab9195a00f (diff) | |
| download | gitlab-ce-24424d932f10c1a498a77d742d5ffd6ae18c506d.tar.gz | |
Fix merge conflict size limitfix-allowed-conflict-size
Diffstat (limited to 'lib/gitlab/conflict/parser.rb')
| -rw-r--r-- | lib/gitlab/conflict/parser.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/conflict/parser.rb b/lib/gitlab/conflict/parser.rb index 2d4d55daeeb..98e842cded3 100644 --- a/lib/gitlab/conflict/parser.rb +++ b/lib/gitlab/conflict/parser.rb @@ -18,7 +18,7 @@ module Gitlab def parse(text, our_path:, their_path:, parent_file: nil) raise UnmergeableFile if text.blank? # Typically a binary file - raise UnmergeableFile if text.length > 102400 + raise UnmergeableFile if text.length > 200.kilobytes begin text.to_json |