Merge upstream 2.0ish #165

2017-10-11 10:43:10 -07:00
parent f0a2a6c875 476e79b8e3
commit 8d6b9ba494
322 changed files with 8478 additions and 2587 deletions
--- a/app/models/stream_entry.rb
+++ b/app/models/stream_entry.rb
@@ -1,16 +1,15 @@
 # frozen_string_literal: true
-
 # == Schema Information
 #
 # Table name: stream_entries
 #
-#  id            :integer          not null, primary key
-#  account_id    :integer
 #  activity_id   :integer
 #  activity_type :string
 #  created_at    :datetime         not null
 #  updated_at    :datetime         not null
 #  hidden        :boolean          default(FALSE), not null
+#  account_id    :integer
+#  id            :integer          not null, primary key
 #

 class StreamEntry < ApplicationRecord