diff options
author | Robert Speicher <robert@gitlab.com> | 2018-10-08 15:40:04 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2018-10-08 15:40:04 +0000 |
commit | b204ff6a139c396fce0f6664ce0be3574e638c76 (patch) | |
tree | 752ca753da3dc21f76cab0c3d2c59d45bd566c1a | |
parent | 93b5b45d08715d53fa3c1e46789ed799ced20708 (diff) | |
parent | 32eebfcfe11144e2be2ac8b9adc74c98427849cd (diff) | |
download | gitlab-ce-b204ff6a139c396fce0f6664ce0be3574e638c76.tar.gz |
Merge branch 'sh-fix-note-comments' into 'master'
Fix comments in app/models/note.rb
See merge request gitlab-org/gitlab-ce!22171
-rw-r--r-- | app/models/note.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/models/note.rb b/app/models/note.rb index 1b595ef60b4..95e1d3afa00 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -38,14 +38,14 @@ class Note < ActiveRecord::Base alias_attribute :last_edited_at, :updated_at alias_attribute :last_edited_by, :updated_by - # Number of user visible references as generated by Banzai::ObjectRenderer + # Attribute containing rendered and redacted Markdown as generated by + # Banzai::ObjectRenderer. attr_accessor :redacted_note_html # Total of all references as generated by Banzai::ObjectRenderer attr_accessor :total_reference_count - # An Array containing the number of visible references as generated by - # Banzai::ObjectRenderer + # Number of user visible references as generated by Banzai::ObjectRenderer attr_accessor :user_visible_reference_count # Attribute used to store the attributes that have been changed by quick actions. |