Add latest changes from gitlab-org/gitlab@master

1 files changed, 5 insertions, 5 deletions

diff --git a/app/models/issue.rb b/app/models/issue.rb
index d4eb77ef6de..ce7bac3fd5f 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -613,6 +613,11 @@ class Issue < ApplicationRecord
     super || WorkItems::Type.default_by_type(issue_type)
   end
 
+  def expire_etag_cache
+    key = Gitlab::Routing.url_helpers.realtime_changes_project_issue_path(project, self)
+    Gitlab::EtagCaching::Store.new.touch(key)
+  end
+
   private
 
   override :persist_pg_full_text_search_vector
@@ -643,11 +648,6 @@ class Issue < ApplicationRecord
       !confidential? && !hidden? && !::Gitlab::ExternalAuthorization.enabled?
   end
 
-  def expire_etag_cache
-    key = Gitlab::Routing.url_helpers.realtime_changes_project_issue_path(project, self)
-    Gitlab::EtagCaching::Store.new.touch(key)
-  end
-
   def could_not_move(exception)
     # Symptom of running out of space - schedule rebalancing
     Issues::RebalancingWorker.perform_async(nil, *project.self_or_root_group_ids)