diff options
| author | Nick Thomas <nick@gitlab.com> | 2018-12-15 15:21:54 +0300 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2018-12-15 15:21:54 +0300 |
| commit | 8d2e1b724bd515c5977090d722b915f374218eb3 (patch) | |
| tree | 3e52f0b8994fa274326dacb1a942ab265462d73e /spec/support/shared_examples | |
| parent | c027101d34ebdbd935e2c2b35827323c110b3654 (diff) | |
| parent | 9f9eb03f3d8247438523a9fee3a83967fecd8114 (diff) | |
Merge branch '54786-mr-empty-file-display' into 'master'
Display empty files properly on MR diffs
Closes #54786
See merge request gitlab-org/gitlab-ce!23671
Diffstat (limited to 'spec/support/shared_examples')
| -rw-r--r-- | spec/support/shared_examples/serializers/diff_file_entity_examples.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/support/shared_examples/serializers/diff_file_entity_examples.rb b/spec/support/shared_examples/serializers/diff_file_entity_examples.rb index b8065886c42..1770308f789 100644 --- a/spec/support/shared_examples/serializers/diff_file_entity_examples.rb +++ b/spec/support/shared_examples/serializers/diff_file_entity_examples.rb @@ -32,7 +32,7 @@ shared_examples 'diff file entity' do it 'exposes correct attributes' do expect(subject).to include(:too_large, :added_lines, :removed_lines, :context_lines_path, :highlighted_diff_lines, - :parallel_diff_lines) + :parallel_diff_lines, :empty) end it 'includes viewer' do |