diff options
| author | Sean McGivern <sean@gitlab.com> | 2017-05-12 19:44:03 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2017-06-02 21:37:09 +0300 |
| commit | 1d3c33b57eeb39df76e78fd37c86532c02aa22ac (patch) | |
| tree | 8c2a51cbf1fb6153192491c9d96e70d931c48041 /spec/features/merge_requests/conflicts_spec.rb | |
| parent | f07aee72bef4604312e11a43fce3a47865bce100 (diff) | |
Increase diff limits to 100 KB for collapse and 200 KB overall
This is controlled with the feature flag gitlab_git_diff_size_limit_increase.
Both of these limits were basically picked arbitrarily in the first place;
disabling the feature flag reverts to the old limits.
Diffstat (limited to 'spec/features/merge_requests/conflicts_spec.rb')
| -rw-r--r-- | spec/features/merge_requests/conflicts_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/features/merge_requests/conflicts_spec.rb b/spec/features/merge_requests/conflicts_spec.rb index 7f669565085..27e2d5d16f3 100644 --- a/spec/features/merge_requests/conflicts_spec.rb +++ b/spec/features/merge_requests/conflicts_spec.rb @@ -100,7 +100,7 @@ feature 'Merge request conflict resolution', js: true, feature: true do context 'in Parallel view mode' do before do - click_link('conflicts', href: /\/conflicts\Z/) + click_link('conflicts', href: /\/conflicts\Z/) click_button 'Side-by-side' end |