Merge remote-tracking branch 'upstream/pull/5499'

diff --combined app/models/note.rb
index d23f458e51f6ca80a7f6aea61363353ee7724fd9,d3d4d5c73eb568c96aa25e424f5b4521a6ca4371..17b57c0fa689ff5d6691d71b05ce6539a5770688
--- 1/app/models/note.rb
--- 2/app/models/note.rb
+++ b/app/models/note.rb
@@@ -2,14 -2,17 +2,17 @@@
  #
  # Table name: notes
  #
- #  id         :bigint(8)        not null, primary key
- #  latitude   :integer          not null
- #  longitude  :integer          not null
- #  tile       :bigint(8)        not null
- #  updated_at :datetime         not null
- #  created_at :datetime         not null
- #  status     :enum             not null
- #  closed_at  :datetime
+ #  id          :bigint(8)        not null, primary key
+ #  latitude    :integer          not null
+ #  longitude   :integer          not null
+ #  tile        :bigint(8)        not null
+ #  updated_at  :datetime         not null
+ #  created_at  :datetime         not null
+ #  status      :enum             not null
+ #  closed_at   :datetime
+ #  description :text             default(""), not null
+ #  user_id     :bigint(8)
+ #  user_ip     :inet
  #
  # Indexes
  #
@@@ -17,6 -20,10 +20,10 @@@
  #  notes_tile_status_idx  (tile,status)
  #  notes_updated_at_idx   (updated_at)
  #
+ # Foreign Keys
+ #
+ #  notes_user_id_fkey  (user_id => users.id)
+ #
  
  class Note < ApplicationRecord
    include GeoRecord
@@@ -82,22 -89,12 +89,22 @@@
      closed_at + DEFAULT_FRESHLY_CLOSED_LIMIT
    end
  
 -  # Return the author object, derived from the first comment
 +  # Return the note's description, derived from the first comment
 +  def description
 +    comments.first.body
 +  end
 +
 +  # Return the note's author object, derived from the first comment
    def author
      comments.first.author
    end
  
 -  # Return the author IP address, derived from the first comment
 +  # Return the note's author ID, derived from the first comment
 +  def author_id
 +    comments.first.author_id
 +  end
 +
 +  # Return the note's author IP address, derived from the first comment
    def author_ip
      comments.first.author_ip
    end