diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/concerns/notes_actions.rb | 2 | ||||
| -rw-r--r-- | app/models/note.rb | 2 | ||||
| -rw-r--r-- | app/serializers/note_entity.rb | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/app/controllers/concerns/notes_actions.rb b/app/controllers/concerns/notes_actions.rb index 726838bb284..18fd8eb114d 100644 --- a/app/controllers/concerns/notes_actions.rb +++ b/app/controllers/concerns/notes_actions.rb @@ -89,7 +89,7 @@ module NotesActions if note.persisted? attrs[:valid] = true - if noteable.discussions_rendered_on_frontend? + if noteable.nil? || noteable.discussions_rendered_on_frontend? attrs.merge!(note_serializer.represent(note)) else attrs.merge!( diff --git a/app/models/note.rb b/app/models/note.rb index d807d5ad618..1073c115630 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -300,7 +300,7 @@ class Note < ActiveRecord::Base end def expire_etag_cache - return unless noteable.discussions_rendered_on_frontend? + return unless noteable&.discussions_rendered_on_frontend? key = Gitlab::Routing.url_helpers.project_noteable_notes_path( project, diff --git a/app/serializers/note_entity.rb b/app/serializers/note_entity.rb index 663a9c06c40..7d50e0ff10d 100644 --- a/app/serializers/note_entity.rb +++ b/app/serializers/note_entity.rb @@ -14,8 +14,8 @@ class NoteEntity < API::Entities::Note expose :redacted_note_html, as: :note_html - expose :last_edited_at, if: -> (note, _) { note.is_edited? } - expose :last_edited_by, using: NoteUserEntity, if: -> (note, _) { note.is_edited? } + expose :last_edited_at, if: -> (note, _) { note.edited? } + expose :last_edited_by, using: NoteUserEntity, if: -> (note, _) { note.edited? } expose :current_user do expose :can_edit do |note| |