diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-20 16:18:24 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-20 16:18:24 +0300 |
| commit | 0653e08efd039a5905f3fa4f6e9cef9f5d2f799c (patch) | |
| tree | 4dcc884cf6d81db44adae4aa99f8ec1233a41f55 /app/models/user_detail.rb | |
| parent | 744144d28e3e7fddc117924fef88de5d9674fe4c (diff) | |
Add latest changes from gitlab-org/gitlab@14-3-stable-eev14.3.0-rc42
Diffstat (limited to 'app/models/user_detail.rb')
| -rw-r--r-- | app/models/user_detail.rb | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/app/models/user_detail.rb b/app/models/user_detail.rb index b3cca1e0cc0..c41cff67864 100644 --- a/app/models/user_detail.rb +++ b/app/models/user_detail.rb @@ -2,7 +2,8 @@ class UserDetail < ApplicationRecord extend ::Gitlab::Utils::Override - include CacheMarkdownField + include IgnorableColumns + ignore_columns %i[bio_html cached_markdown_version], remove_with: '13.6', remove_after: '2021-10-22' belongs_to :user @@ -13,20 +14,6 @@ class UserDetail < ApplicationRecord before_save :prevent_nil_bio - cache_markdown_field :bio - - def bio_html - read_attribute(:bio_html) || bio - end - - # For backward compatibility. - # Older migrations (and their tests) reference the `User.migration_bot` where the `bio` attribute is set. - # Here we disable writing the markdown cache when the `bio_html` column does not exist. - override :invalidated_markdown_cache? - def invalidated_markdown_cache? - self.class.column_names.include?('bio_html') && super - end - private def prevent_nil_bio |