Commit 975205f7 authored by Committed by Ruben Davila
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
Showing with 8 additions and 3 deletions