diff options
| author | Douwe Maan <douwe@selenight.nl> | 2016-07-07 18:05:34 -0400 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2016-07-07 18:05:34 -0400 |
| commit | 5a8f727fd5400634a99eae82e7bac5e26cf36d4e (patch) | |
| tree | dde30050a8992e4ba0b5d3f0e98794d1f6089df8 /spec/helpers | |
| parent | d925aea9f388f8ca5c858e825e5303232fa16c1d (diff) | |
| parent | 86d238e4bda6424a79eb9d8ea7cfe41af714f49f (diff) | |
| download | gitlab-ce-5a8f727fd5400634a99eae82e7bac5e26cf36d4e.tar.gz | |
Merge branch 'master' into faster-diffs
# Conflicts:
# app/helpers/notes_helper.rb
# app/views/projects/diffs/_line.html.haml
# app/views/projects/diffs/_parallel_view.html.haml
# app/views/projects/diffs/_text_file.html.haml
# features/steps/shared/diff_note.rb
Diffstat (limited to 'spec/helpers')
| -rw-r--r-- | spec/helpers/diff_helper_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/helpers/diff_helper_spec.rb b/spec/helpers/diff_helper_spec.rb index a71dd53e6ed..7ea9fa933f0 100644 --- a/spec/helpers/diff_helper_spec.rb +++ b/spec/helpers/diff_helper_spec.rb @@ -9,7 +9,7 @@ describe DiffHelper do let(:diffs) { commit.diffs } let(:diff) { diffs.first } let(:diff_refs) { [commit.parent, commit] } - let(:diff_file) { Gitlab::Diff::File.new(diff, diff_refs) } + let(:diff_file) { Gitlab::Diff::File.new(diff, diff_refs: diff_refs, repository: repository) } describe 'diff_view' do it 'returns a valid value when cookie is set' do |