Revert "Merge branch 'osw-comment-on-any-line-on-diffs' into 'master'"osw-revert-comment-in-any-diff-line

This reverts commit a82a595728d54bdc12e51dfcfb22e9eddc449143, reversing
changes made to e7df959b8f99875edd246c7ac7779c3203e8755e.

3 files changed, 2 insertions, 20 deletions

diff --git a/app/services/notes/base_service.rb b/app/services/notes/base_service.rb
deleted file mode 100644
index 431ff6c11c4..00000000000
--- a/app/services/notes/base_service.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-module Notes
-  class BaseService < ::BaseService
-    def clear_noteable_diffs_cache(note)
-      noteable = note.noteable
-
-      if note.is_a?(DiffNote) &&
-          note.discussion_first_note? &&
-          note.position.unfolded_diff?(project.repository)
-        noteable.diffs.clear_cache
-      end
-    end
-  end
-end
diff --git a/app/services/notes/create_service.rb b/app/services/notes/create_service.rb
index e03789e3ca9..049e6c5a871 100644
--- a/app/services/notes/create_service.rb
+++ b/app/services/notes/create_service.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Notes
-  class CreateService < ::Notes::BaseService
+  class CreateService < ::BaseService
     def execute
       merge_request_diff_head_sha = params.delete(:merge_request_diff_head_sha)
 
@@ -35,7 +35,6 @@ module Notes
 
       if !only_commands && note.save
         todo_service.new_note(note, current_user)
-        clear_noteable_diffs_cache(note)
       end
 
       if command_params.present?
diff --git a/app/services/notes/destroy_service.rb b/app/services/notes/destroy_service.rb
index fa0c2c5c86b..64e9accd97f 100644
--- a/app/services/notes/destroy_service.rb
+++ b/app/services/notes/destroy_service.rb
@@ -1,13 +1,11 @@
 # frozen_string_literal: true
 
 module Notes
-  class DestroyService < ::Notes::BaseService
+  class DestroyService < BaseService
     def execute(note)
       TodoService.new.destroy_target(note) do |note|
         note.destroy
       end
-
-      clear_noteable_diffs_cache(note)
     end
   end
 end