diff options
author | Rémy Coutable <remy@rymai.me> | 2016-09-07 16:14:20 +0000 |
---|---|---|
committer | Ruben Davila <rdavila84@gmail.com> | 2016-09-13 21:00:35 -0500 |
commit | 975205f7e27f900159512c80bf4dfea4bb52aefd (patch) | |
tree | e5036ee6253f9ee52917a7f2955ca093b88ebde0 | |
parent | 70ddbfc3e50e3331a4f672201a439d95daa5b981 (diff) | |
download | gitlab-ce-975205f7e27f900159512c80bf4dfea4bb52aefd.tar.gz |
Merge branch 'fix-allowed-conflict-size' into 'master'
Fix merge conflict size limit
## What does this MR do?
The merge conflict size limit was set to 100 KB, but the docs (and the test repo, which the feature specs use) say 200 KB!
## Are there points in the code the reviewer needs to double check?
Don't think so.
## Why was this MR needed?
Derp.
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- Tests
- [x] Added for this feature/bug
- [ ] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !6052
-rw-r--r-- | CHANGELOG | 5 | ||||
-rw-r--r-- | lib/gitlab/conflict/parser.rb | 2 | ||||
-rw-r--r-- | spec/lib/gitlab/conflict/parser_spec.rb | 4 |
3 files changed, 8 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG index 5252e20a027..ed9e87b5ff3 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -138,6 +138,11 @@ v 8.11.6 (unreleased) v 8.11.5 - Optimize branch lookups and force a repository reload for Repository#find_branch. !6087 - Fix member expiration date picker after update. !6184 + +v 8.11.5 (unreleased) + - Optimize branch lookups and force a repository reload for Repository#find_branch + - Fix member expiration date picker after update + - Make merge conflict file size limit 200 KB, to match the docs - Fix suggested colors options for new labels in the admin area. !6138 - Optimize discussion notes resolving and unresolving - Fix GitLab import button 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 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 |