diff options
| author | Sean McGivern <sean@gitlab.com> | 2017-06-09 14:48:25 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2017-06-16 20:30:01 +0300 |
| commit | 9a73b634ab4220f68a8296ccb582a68293874489 (patch) | |
| tree | f99d9eb55836dcdb54c18f72d4b1242a5d9acefa /spec/lib/gitlab/git/diff_spec.rb | |
| parent | 352a9ed56213b6f83a679e72f9554638a0aed1ee (diff) | |
Add table for files in merge request diffs
This adds an ID-less table containing one row per file, per merge request
diff. It has a column for each attribute on Gitlab::Git::Diff that is serialised
currently, with the advantage that we can easily query the attributes of this
new table.
It does not migrate existing data, so we have fallback code when the legacy
st_diffs column is present instead. For a merge request diff to be valid, it
should have at most one of:
* Rows in this new table, with the correct merge_request_diff_id.
* A non-NULL st_diffs column.
It may have neither, if the diff is empty.
Diffstat (limited to 'spec/lib/gitlab/git/diff_spec.rb')
| -rw-r--r-- | spec/lib/gitlab/git/diff_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/lib/gitlab/git/diff_spec.rb b/spec/lib/gitlab/git/diff_spec.rb index da213f617cc..78d741f0110 100644 --- a/spec/lib/gitlab/git/diff_spec.rb +++ b/spec/lib/gitlab/git/diff_spec.rb @@ -90,7 +90,7 @@ EOT let(:diff) { described_class.new(@rugged_diff) } it 'initializes the diff' do - expect(diff.to_hash).to eq(@raw_diff_hash.merge(too_large: nil)) + expect(diff.to_hash).to eq(@raw_diff_hash) end it 'does not prune the diff' do |