diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-05-28 12:47:06 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-05-28 12:47:06 +0300 |
| commit | 0a43b25c20010b3eb4c9ab8cef8712df99702fac (patch) | |
| tree | a5a88ace827c2329b437070c7774d40c54d4a476 /spec/models/concerns | |
| parent | cfdd80ec10c669a6f6811aef02b0df233a709881 (diff) | |
| parent | bb8f2520b4254c9dabe377df48e29c5f17894a1d (diff) | |
Merge branch '45190-create-notes-diff-files' into 'master'
Persist and use truncated note diffs instead requesting Gitaly in a N+1 manner on MR page
Closes #45190
See merge request gitlab-org/gitlab-ce!18991
Diffstat (limited to 'spec/models/concerns')
| -rw-r--r-- | spec/models/concerns/discussion_on_diff_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/models/concerns/discussion_on_diff_spec.rb b/spec/models/concerns/discussion_on_diff_spec.rb index 30572ce9332..8cd129dc851 100644 --- a/spec/models/concerns/discussion_on_diff_spec.rb +++ b/spec/models/concerns/discussion_on_diff_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe DiscussionOnDiff do - subject { create(:diff_note_on_merge_request).to_discussion } + subject { create(:diff_note_on_merge_request, line_number: 18).to_discussion } describe "#truncated_diff_lines" do let(:truncated_lines) { subject.truncated_diff_lines } |