diff options
| author | Brett Walker <bwalker@gitlab.com> | 2019-01-21 16:16:23 -0600 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2019-01-30 23:18:15 +0100 |
| commit | ff1e64902821eaa09dbdfb6acc382b33ed7f2e37 (patch) | |
| tree | 7a625666d553a9468d34b046f0d5993a5addc15f /app/models/concerns | |
| parent | e2e2f0d3788fbc1bad951eb7f2186d56f9b49c66 (diff) | |
| download | gitlab-ce-ff1e64902821eaa09dbdfb6acc382b33ed7f2e37.tar.gz | |
Don't consider field invalid if updating html also
Diffstat (limited to 'app/models/concerns')
| -rw-r--r-- | app/models/concerns/cache_markdown_field.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/models/concerns/cache_markdown_field.rb b/app/models/concerns/cache_markdown_field.rb index 73a27326f6c..0ccc03db15a 100644 --- a/app/models/concerns/cache_markdown_field.rb +++ b/app/models/concerns/cache_markdown_field.rb @@ -178,7 +178,9 @@ module CacheMarkdownField # author and project invalidate the cache in all circumstances. define_method(invalidation_method) do changed_fields = changed_attributes.keys - invalidations = changed_fields & [markdown_field.to_s, *INVALIDATED_BY] + invalidations = changed_fields & [markdown_field.to_s, *INVALIDATED_BY] + invalidations.delete(markdown_field.to_s) if changed_fields.include?("#{markdown_field}_html") + !invalidations.empty? || !cached_html_up_to_date?(markdown_field) end end |