Merge branch...

Merge branch 'ee-41291-spec-failure-on-spec-features-merge_requests-image_diff_notes_spec-rb' into 'master'

[EE] Fix a failure because we stub DiffHelper#diff_file_blob_raw_path instead of #diff_file_blob_raw_url

See merge request gitlab-org/gitlab-ee!3855

spec/features/merge_requests/image_diff_notes_spec.rb

@@ -12,7 +12,8 @@ feature 'image diff notes', :js do
 
     # Stub helper to return any blob file as image from public app folder.
     # This is necessary to run this specs since we don't display repo images in capybara.
-    allow_any_instance_of(DiffHelper).to receive(:diff_file_blob_raw_path).and_return('/apple-touch-icon.png')
+    allow_any_instance_of(DiffHelper).to receive(:diff_file_blob_raw_url).and_return('/apple-touch-icon.png')
+    allow_any_instance_of(DiffHelper).to receive(:diff_file_old_blob_raw_url).and_return('/favicon.ico')
   end
 
   context 'create commit diff notes' do