add allowed_ips to api_keys

update annotations

app/models/api_key.rb

@@ -31,6 +31,7 @@ end
 #  created_by_id :integer
 #  created_at    :datetime         not null
 #  updated_at    :datetime         not null
+#  allowed_ips   :inet             is an Array
 #
 # Indexes
 #

app/models/badge.rb

@@ -303,6 +303,7 @@ end
 #  trigger           :integer
 #  show_posts        :boolean          default(FALSE), not null
 #  system            :boolean          default(FALSE), not null
+#  image             :string(255)
 #
 # Indexes
 #

app/models/category.rb

@@ -425,6 +425,7 @@ end
 #  background_url                :string(255)
 #  allow_badges                  :boolean          default(TRUE), not null
 #  name_lower                    :string(50)       not null
+#  auto_close_based_on_last_post :boolean          default(FALSE)
 #
 # Indexes
 #

app/models/post.rb

@@ -580,13 +580,14 @@ end
 #  version                 :integer          default(1), not null
 #  cook_method             :integer          default(1), not null
 #  wiki                    :boolean          default(FALSE), not null
-#  via_email               :boolean          default(FALSE), not null
-#  raw_email               :text
 #  baked_at                :datetime
 #  baked_version           :integer
 #  hidden_at               :datetime
 #  self_edits              :integer          default(0), not null
 #  reply_quoted            :boolean          default(FALSE), not null
+#  via_email               :boolean          default(FALSE), not null
+#  raw_email               :text
+#  public_version          :integer          default(1), not null
 #
 # Indexes
 #

app/models/post_action.rb

@@ -464,5 +464,6 @@ end
 # Indexes
 #
 #  idx_unique_actions             (user_id,post_action_type_id,post_id,targets_topic) UNIQUE
+#  idx_unique_flags               (user_id,post_id,targets_topic) UNIQUE
 #  index_post_actions_on_post_id  (post_id)
 #

app/models/post_revision.rb

@@ -47,6 +47,7 @@ end
 #  number        :integer
 #  created_at    :datetime         not null
 #  updated_at    :datetime         not null
+#  hidden        :boolean          default(FALSE), not null
 #
 # Indexes
 #

app/models/site_customization.rb

@@ -215,6 +215,8 @@ end
 #  mobile_stylesheet       :text
 #  mobile_header           :text
 #  mobile_stylesheet_baked :text
+#  footer                  :text
+#  mobile_footer           :text
 #
 # Indexes
 #

app/models/site_text.rb

@@ -33,7 +33,7 @@ end
 
 # == Schema Information
 #
-# Table name: site_text
+# Table name: site_texts
 #
 #  text_type  :string(255)      not null, primary key
 #  value      :text             not null
@@ -42,5 +42,5 @@ end
 #
 # Indexes
 #
-#  index_site_text_on_text_type  (text_type) UNIQUE
+#  index_site_texts_on_text_type  (text_type) UNIQUE
 #

app/models/topic.rb

@@ -905,6 +905,8 @@ end
 #  word_count                    :integer
 #  excerpt                       :string(1000)
 #  pinned_globally               :boolean          default(FALSE), not null
+#  auto_close_based_on_last_post :boolean          default(FALSE)
+#  auto_close_hours              :float
 #
 # Indexes
 #

app/models/topic_user.rb

@@ -297,4 +297,5 @@ end
 # Indexes
 #
 #  index_topic_users_on_topic_id_and_user_id  (topic_id,user_id) UNIQUE
+#  index_topic_users_on_user_id_and_topic_id  (user_id,topic_id) UNIQUE
 #

app/models/upload.rb

@@ -150,6 +150,7 @@ end
 #  updated_at        :datetime         not null
 #  sha1              :string(40)
 #  origin            :string(1000)
+#  retain_hours      :integer
 #
 # Indexes
 #

app/models/user.rb

@@ -875,12 +875,13 @@ end
 #  uploaded_avatar_id            :integer
 #  email_always                  :boolean          default(FALSE), not null
 #  mailing_list_mode             :boolean          default(FALSE), not null
-#  primary_group_id              :integer
 #  locale                        :string(10)
+#  primary_group_id              :integer
 #  registration_ip_address       :inet
 #  last_redirected_to_top_at     :datetime
 #  disable_jump_reply            :boolean          default(FALSE), not null
 #  edit_history_public           :boolean          default(FALSE), not null
+#  trust_level_locked            :boolean          default(FALSE), not null
 #
 # Indexes
 #

app/models/user_field.rb

@@ -1,3 +1,17 @@
 class UserField < ActiveRecord::Base
   validates_presence_of :name, :description, :field_type
 end
+
+# == Schema Information
+#
+# Table name: user_fields
+#
+#  id          :integer          not null, primary key
+#  name        :string(255)      not null
+#  field_type  :string(255)      not null
+#  created_at  :datetime
+#  updated_at  :datetime
+#  editable    :boolean          default(FALSE), not null
+#  description :string(255)      not null
+#  required    :boolean          default(TRUE), not null
+#

app/models/user_history.rb

@@ -126,6 +126,7 @@ end
 #  new_value      :text
 #  topic_id       :integer
 #  admin_only     :boolean          default(FALSE)
+#  post_id        :integer
 #
 # Indexes
 #

app/models/user_profile.rb

@@ -106,10 +106,12 @@ end
 #  website              :string(255)
 #  bio_raw              :text
 #  bio_cooked           :text
-#  dismissed_banner_key :integer
 #  profile_background   :string(255)
-#  card_background      :string(255)
+#  dismissed_banner_key :integer
 #  bio_cooked_version   :integer
+#  badge_granted_title  :boolean          default(FALSE)
+#  card_background      :string(255)
+#  card_image_badge_id  :integer
 #
 # Indexes
 #

app/models/warning.rb

@@ -3,3 +3,20 @@ class Warning < ActiveRecord::Base
   belongs_to :topic
   belongs_to :created_by, class_name: 'User'
 end
+
+# == Schema Information
+#
+# Table name: warnings
+#
+#  id            :integer          not null, primary key
+#  topic_id      :integer          not null
+#  user_id       :integer          not null
+#  created_by_id :integer          not null
+#  created_at    :datetime
+#  updated_at    :datetime
+#
+# Indexes
+#
+#  index_warnings_on_topic_id  (topic_id) UNIQUE
+#  index_warnings_on_user_id   (user_id)
+#

db/migrate/20141120035016_add_allowed_ips_to_api_keys.rb

@@ -0,0 +1,7 @@
+class AddAllowedIpsToApiKeys < ActiveRecord::Migration
+  def change
+    change_table :api_keys do |t|
+      t.inet :allowed_ips, array: true
+    end
+  end
+end