diff options
author | Oswaldo Ferreira <oswaldo@gitlab.com> | 2018-11-07 19:57:26 -0200 |
---|---|---|
committer | Oswaldo Ferreira <oswaldo@gitlab.com> | 2018-11-07 19:57:26 -0200 |
commit | 198402b38b59a43aa6e50259d7c13c0097dbdfac (patch) | |
tree | 972469d726a9fc38fa990ed6a5b29d9e91b409f6 /app/services | |
parent | 8467167bbc7fb16e25b202c6eda37a9fe1f1a9d7 (diff) | |
download | gitlab-ce-198402b38b59a43aa6e50259d7c13c0097dbdfac.tar.gz |
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.
Diffstat (limited to 'app/services')
-rw-r--r-- | app/services/merge_requests/reload_diffs_service.rb | 4 | ||||
-rw-r--r-- | app/services/notes/base_service.rb | 15 | ||||
-rw-r--r-- | app/services/notes/create_service.rb | 3 | ||||
-rw-r--r-- | app/services/notes/destroy_service.rb | 4 |
4 files changed, 6 insertions, 20 deletions
diff --git a/app/services/merge_requests/reload_diffs_service.rb b/app/services/merge_requests/reload_diffs_service.rb index c64b2e99b52..b47d8f3f63a 100644 --- a/app/services/merge_requests/reload_diffs_service.rb +++ b/app/services/merge_requests/reload_diffs_service.rb @@ -29,6 +29,10 @@ module MergeRequests # rubocop: disable CodeReuse/ActiveRecord def clear_cache(new_diff) + # Executing the iteration we cache highlighted diffs for each diff file of + # MergeRequestDiff. + cacheable_collection(new_diff).write_cache + # Remove cache for all diffs on this MR. Do not use the association on the # model, as that will interfere with other actions happening when # reloading the diff. 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 |