diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-07 00:07:42 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-07 00:07:42 +0000 |
commit | defeeba1a8d6fa8784db1c50ca4ff9e8b56f539c (patch) | |
tree | da50633fb0b41bd238a1b972c69488073599fe28 /app/models/concerns | |
parent | 8ec004d6d8d92f00d0598e94ede4d31ab1e8f18e (diff) | |
download | gitlab-ce-defeeba1a8d6fa8784db1c50ca4ff9e8b56f539c.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/concerns')
-rw-r--r-- | app/models/concerns/noteable.rb | 1 | ||||
-rw-r--r-- | app/models/concerns/referable.rb | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/models/concerns/noteable.rb b/app/models/concerns/noteable.rb index 7addcf9e2ec..0333cfc5f9e 100644 --- a/app/models/concerns/noteable.rb +++ b/app/models/concerns/noteable.rb @@ -169,6 +169,7 @@ module Noteable def expire_note_etag_cache return unless discussions_rendered_on_frontend? return unless etag_caching_enabled? + return unless project.present? Gitlab::EtagCaching::Store.new.touch(note_etag_key) end diff --git a/app/models/concerns/referable.rb b/app/models/concerns/referable.rb index 9a17131c91c..5303d110078 100644 --- a/app/models/concerns/referable.rb +++ b/app/models/concerns/referable.rb @@ -76,7 +76,11 @@ module Referable true end - def link_reference_pattern(route, pattern) + def link_reference_pattern + raise NotImplementedError, "#{self} does not implement #{__method__}" + end + + def compose_link_reference_pattern(route, pattern) %r{ (?<url> #{Regexp.escape(Gitlab.config.gitlab.url)} |