diff options
author | Jan Provaznik <jprovaznik@gitlab.com> | 2018-10-29 19:10:32 +0300 |
---|---|---|
committer | Jan Provaznik <jprovaznik@gitlab.com> | 2018-10-29 19:10:32 +0300 |
commit | 5b0b73d922f5081e84697d439b30959161966727 (patch) | |
tree | 4b1aef1253a3895cea2ee42a86cf377a87ae617d /app/models/note.rb | |
parent | f0b3edf2ca9f7f1dd64d3b17eda006ab9983cfc4 (diff) | |
parent | c1c1496405620d99d5943b1c4b5277b4b7d6ad63 (diff) |
Merge branch 'security-redact-links' into 'master'
[master] Redact unsubscribe links in issuable texts
See merge request gitlab/gitlabhq!2528
Diffstat (limited to 'app/models/note.rb')
-rw-r--r-- | app/models/note.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/models/note.rb b/app/models/note.rb index e1bd943e8e4..990689a95f5 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -10,6 +10,7 @@ class Note < ActiveRecord::Base include Awardable include Importable include FasterCacheKeys + include Redactable include CacheMarkdownField include AfterCommitQueue include ResolvableNote @@ -33,6 +34,8 @@ class Note < ActiveRecord::Base cache_markdown_field :note, pipeline: :note, issuable_state_filter_enabled: true + redact_field :note + # Aliases to make application_helper#edited_time_ago_with_tooltip helper work properly with notes. # See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10392/diffs#note_28719102 alias_attribute :last_edited_at, :updated_at |