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 /spec/lib/gitlab/conflict | |
| parent | f7b64a46161337cf8c2d8a5cb8c154ab9195a00f (diff) | |
| download | gitlab-ce-24424d932f10c1a498a77d742d5ffd6ae18c506d.tar.gz | |
Fix merge conflict size limitfix-allowed-conflict-size
Diffstat (limited to 'spec/lib/gitlab/conflict')
| -rw-r--r-- | spec/lib/gitlab/conflict/parser_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/lib/gitlab/conflict/parser_spec.rb b/spec/lib/gitlab/conflict/parser_spec.rb index a1d2ca1e272..16eb3766356 100644 --- a/spec/lib/gitlab/conflict/parser_spec.rb +++ b/spec/lib/gitlab/conflict/parser_spec.rb @@ -179,8 +179,8 @@ CONFLICT to raise_error(Gitlab::Conflict::Parser::UnmergeableFile) end - it 'raises UnmergeableFile when the file is over 100 KB' do - expect { parse_text('a' * 102401) }. + it 'raises UnmergeableFile when the file is over 200 KB' do + expect { parse_text('a' * 204801) }. to raise_error(Gitlab::Conflict::Parser::UnmergeableFile) end |