diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-02 15:09:03 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-02 15:09:03 +0300 |
commit | c80b69a93fb4a6708b3337aa6e243ad09fe1d295 (patch) | |
tree | e3ad5a541f73d9457ae29fcf915c0fc6538cc149 /spec/features/expand_collapse_diffs_spec.rb | |
parent | 94823a9248837114ec84582f83b642ec45fe68ad (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/features/expand_collapse_diffs_spec.rb')
-rw-r--r-- | spec/features/expand_collapse_diffs_spec.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/spec/features/expand_collapse_diffs_spec.rb b/spec/features/expand_collapse_diffs_spec.rb index 49343cc7a57..0912df22924 100644 --- a/spec/features/expand_collapse_diffs_spec.rb +++ b/spec/features/expand_collapse_diffs_spec.rb @@ -8,6 +8,8 @@ RSpec.describe 'Expand and collapse diffs', :js do before do stub_feature_flags(increased_diff_limits: false) + allow(Gitlab::CurrentSettings).to receive(:diff_max_patch_bytes).and_return(100.kilobytes) + sign_in(create(:admin)) # Ensure that undiffable.md is in .gitattributes |