Merge pull request #6414 from techAPJ/user-field-unique-key

FEATURE: add external details to user fields

app/models/email_log.rb

@@ -96,9 +96,9 @@ end
 #
 # Indexes
 #
-#  index_email_logs_on_created_at              (created_at)
-#  index_email_logs_on_message_id              (message_id)
-#  index_email_logs_on_post_id                 (post_id)
-#  index_email_logs_on_user_id                 (user_id)
-#  index_email_logs_on_user_id_and_created_at  (user_id,created_at)
+#  index_email_logs_on_bounced     (bounced)
+#  index_email_logs_on_created_at  (created_at)
+#  index_email_logs_on_message_id  (message_id)
+#  index_email_logs_on_post_id     (post_id)
+#  index_email_logs_on_user_id     (user_id)
 #

app/models/optimized_image.rb

@@ -399,6 +399,7 @@ end
 #  height    :integer          not null
 #  upload_id :integer          not null
 #  url       :string           not null
+#  filesize  :integer
 #
 # Indexes
 #

app/models/theme.rb

@@ -402,6 +402,7 @@ end
 #  hidden           :boolean          default(FALSE), not null
 #  color_scheme_id  :integer
 #  remote_theme_id  :integer
+#  component        :boolean          default(FALSE), not null
 #
 # Indexes
 #

app/models/upload.rb

@@ -269,6 +269,8 @@ end
 #  origin            :string(1000)
 #  retain_hours      :integer
 #  extension         :string(10)
+#  thumbnail_width   :integer
+#  thumbnail_height  :integer
 #
 # Indexes
 #

app/models/user_field.rb

@@ -26,4 +26,6 @@ end
 #  show_on_profile   :boolean          default(FALSE), not null
 #  position          :integer          default(0)
 #  show_on_user_card :boolean          default(FALSE), not null
+#  external_name     :string
+#  external_type     :string
 #

app/models/user_stat.rb

@@ -128,6 +128,6 @@ end
 #  first_post_created_at    :datetime
 #  post_count               :integer          default(0), not null
 #  topic_count              :integer          default(0), not null
-#  bounce_score             :integer          default(0), not null
+#  bounce_score             :float            default(0.0), not null
 #  reset_bounce_score_after :datetime
 #

db/migrate/20180920023559_add_external_details_to_user_fields.rb

@@ -0,0 +1,6 @@
+class AddExternalDetailsToUserFields < ActiveRecord::Migration[5.2]
+  def change
+    add_column :user_fields, :external_name, :string
+    add_column :user_fields, :external_type, :string
+  end
+end