diff options
author | Jarka Kadlecova <jarka@gitlab.com> | 2017-01-19 02:37:55 +0300 |
---|---|---|
committer | Jarka Kadlecova <jarka@gitlab.com> | 2017-01-19 02:38:17 +0300 |
commit | bf708e55c2e6035b64861a1cda8bfe3d3b4a2105 (patch) | |
tree | 6eb5f726e0d033a6a69ea1ad900223ef4ef30054 /app/models/concerns | |
parent | d6b11dafd37e78c12c982c42f274928293cdfa53 (diff) |
make mentions working when project not specified
Diffstat (limited to 'app/models/concerns')
-rw-r--r-- | app/models/concerns/cache_markdown_field.rb | 5 | ||||
-rw-r--r-- | app/models/concerns/mentionable.rb | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/app/models/concerns/cache_markdown_field.rb b/app/models/concerns/cache_markdown_field.rb index 90bd6490a02..25970158e70 100644 --- a/app/models/concerns/cache_markdown_field.rb +++ b/app/models/concerns/cache_markdown_field.rb @@ -112,7 +112,10 @@ module CacheMarkdownField invalidation_method = "#{html_field}_invalidated?".to_sym define_method(cache_method) do - html = Banzai::Renderer.cacheless_render_field(self, markdown_field) + options = { + skip_project_check: is_a?(Note) && for_personal_snippet? + } + html = Banzai::Renderer.cacheless_render_field(self, markdown_field, options) __send__("#{html_field}=", html) true end diff --git a/app/models/concerns/mentionable.rb b/app/models/concerns/mentionable.rb index 8ab0401d288..9ded015aad3 100644 --- a/app/models/concerns/mentionable.rb +++ b/app/models/concerns/mentionable.rb @@ -49,7 +49,11 @@ module Mentionable self.class.mentionable_attrs.each do |attr, options| text = __send__(attr) - options = options.merge(cache_key: [self, attr], author: author) + options = options.merge( + cache_key: [self, attr], + author: author, + skip_project_check: is_a?(Note) && for_personal_snippet? + ) extractor.analyze(text, options) end |