Add latest changes from gitlab-org/gitlab@master

1 files changed, 3 insertions, 1 deletions

diff --git a/spec/mailers/notify_spec.rb b/spec/mailers/notify_spec.rb
index cafb96898b3..df82ac38fc6 100644
--- a/spec/mailers/notify_spec.rb
+++ b/spec/mailers/notify_spec.rb
@@ -1095,7 +1095,9 @@ describe Notify do
 
         context 'when note is not on text' do
           before do
-            allow_any_instance_of(DiffDiscussion).to receive(:on_text?).and_return(false)
+            allow_next_instance_of(DiffDiscussion) do |instance|
+              allow(instance).to receive(:on_text?).and_return(false)
+            end
           end
 
           it 'does not include diffs with character-level highlighting' do