Reannotate

33 files changed, 144 insertions, 130 deletions

diff --git a/app/models/deploy_key.rb b/app/models/deploy_key.rb
index f983198085c..47aeb93a419 100644
--- a/app/models/deploy_key.rb
+++ b/app/models/deploy_key.rb
@@ -2,14 +2,14 @@
 #
 # Table name: keys
 #
-#  id         :integer          not null, primary key
-#  user_id    :integer
-#  created_at :datetime
-#  updated_at :datetime
-#  key        :text
-#  title      :string(255)
-#  identifier :string(255)
-#  type       :string(255)
+#  id          :integer          not null, primary key
+#  user_id     :integer
+#  created_at  :datetime         not null
+#  updated_at  :datetime         not null
+#  key         :text
+#  title       :string(255)
+#  type        :string(255)
+#  fingerprint :string(255)
 #
 
 class DeployKey < Key
diff --git a/app/models/issue.rb b/app/models/issue.rb
index 35b487dc3cf..03c1c166137 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -7,13 +7,14 @@
 #  assignee_id  :integer
 #  author_id    :integer
 #  project_id   :integer
-#  created_at   :datetime
-#  updated_at   :datetime
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
 #  position     :integer          default(0)
 #  branch_name  :string(255)
 #  description  :text
 #  milestone_id :integer
 #  state        :string(255)
+#  iid          :integer
 #
 
 class Issue < ActiveRecord::Base
diff --git a/app/models/key.rb b/app/models/key.rb
index 902a7c59116..79f7bbd2590 100644
--- a/app/models/key.rb
+++ b/app/models/key.rb
@@ -2,14 +2,14 @@
 #
 # Table name: keys
 #
-#  id         :integer          not null, primary key
-#  user_id    :integer
-#  created_at :datetime
-#  updated_at :datetime
-#  key        :text
-#  title      :string(255)
-#  identifier :string(255)
-#  type       :string(255)
+#  id          :integer          not null, primary key
+#  user_id     :integer
+#  created_at  :datetime         not null
+#  updated_at  :datetime         not null
+#  key         :text
+#  title       :string(255)
+#  type        :string(255)
+#  fingerprint :string(255)
 #
 
 require 'digest/md5'
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 190f6ab15f4..0bb4b231f62 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -2,21 +2,22 @@
 #
 # Table name: merge_requests
 #
-#  id             :integer          not null, primary key
-#  target_project_id :integer       not null
-#  target_branch  :string(255)      not null
-#  source_project_id :integer       not null
-#  source_branch  :string(255)      not null
-#  author_id      :integer
-#  assignee_id    :integer
-#  title          :string(255)
-#  created_at     :datetime
-#  updated_at     :datetime
-#  st_commits     :text(2147483647)
-#  st_diffs       :text(2147483647)
-#  milestone_id   :integer
-#  state          :string(255)
-#  merge_status   :string(255)
+#  id                :integer          not null, primary key
+#  target_branch     :string(255)      not null
+#  source_branch     :string(255)      not null
+#  source_project_id :integer          not null
+#  author_id         :integer
+#  assignee_id       :integer
+#  title             :string(255)
+#  created_at        :datetime         not null
+#  updated_at        :datetime         not null
+#  st_commits        :text(2147483647)
+#  st_diffs          :text(2147483647)
+#  milestone_id      :integer
+#  state             :string(255)
+#  merge_status      :string(255)
+#  target_project_id :integer          not null
+#  iid               :integer
 #
 
 require Rails.root.join("app/models/commit")
diff --git a/app/models/milestone.rb b/app/models/milestone.rb
index cfa47f30bde..1a73fa71e48 100644
--- a/app/models/milestone.rb
+++ b/app/models/milestone.rb
@@ -10,6 +10,7 @@
 #  created_at  :datetime         not null
 #  updated_at  :datetime         not null
 #  state       :string(255)
+#  iid         :integer
 #
 
 class Milestone < ActiveRecord::Base
diff --git a/app/models/note.rb b/app/models/note.rb
index c0bf79237c1..7598978ad4d 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -6,13 +6,14 @@
 #  note          :text
 #  noteable_type :string(255)
 #  author_id     :integer
-#  created_at    :datetime
-#  updated_at    :datetime
+#  created_at    :datetime         not null
+#  updated_at    :datetime         not null
 #  project_id    :integer
 #  attachment    :string(255)
 #  line_code     :string(255)
 #  commit_id     :string(255)
 #  noteable_id   :integer
+#  st_diff       :text
 #
 
 require 'carrierwave/orm/activerecord'
diff --git a/app/models/personal_snippet.rb b/app/models/personal_snippet.rb
index a3c0d201ee5..ef2000ad05e 100644
--- a/app/models/personal_snippet.rb
+++ b/app/models/personal_snippet.rb
@@ -4,11 +4,11 @@
 #
 #  id         :integer          not null, primary key
 #  title      :string(255)
-#  content    :text
+#  content    :text(2147483647)
 #  author_id  :integer          not null
 #  project_id :integer
-#  created_at :datetime
-#  updated_at :datetime
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
 #  file_name  :string(255)
 #  expires_at :datetime
 #  private    :boolean          default(TRUE), not null
diff --git a/app/models/project.rb b/app/models/project.rb
index a40cea2ad39..b1b7634233c 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -6,8 +6,8 @@
 #  name                   :string(255)
 #  path                   :string(255)
 #  description            :text
-#  created_at             :datetime
-#  updated_at             :datetime
+#  created_at             :datetime         not null
+#  updated_at             :datetime         not null
 #  creator_id             :integer
 #  default_branch         :string(255)
 #  issues_enabled         :boolean          default(TRUE), not null
@@ -21,6 +21,7 @@
 #  snippets_enabled       :boolean          default(TRUE), not null
 #  last_activity_at       :datetime
 #  imported               :boolean          default(FALSE), not null
+#  import_url             :string(255)
 #
 
 require "grit"
diff --git a/app/models/project_hook.rb b/app/models/project_hook.rb
index b82e1ffd4ab..2576fc979d4 100644
--- a/app/models/project_hook.rb
+++ b/app/models/project_hook.rb
@@ -5,8 +5,8 @@
 #  id         :integer          not null, primary key
 #  url        :string(255)
 #  project_id :integer
-#  created_at :datetime
-#  updated_at :datetime
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
 #  type       :string(255)      default("ProjectHook")
 #  service_id :integer
 #
diff --git a/app/models/project_snippet.rb b/app/models/project_snippet.rb
index 14c88046423..f38aa07059c 100644
--- a/app/models/project_snippet.rb
+++ b/app/models/project_snippet.rb
@@ -4,11 +4,11 @@
 #
 #  id         :integer          not null, primary key
 #  title      :string(255)
-#  content    :text
+#  content    :text(2147483647)
 #  author_id  :integer          not null
 #  project_id :integer
-#  created_at :datetime
-#  updated_at :datetime
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
 #  file_name  :string(255)
 #  expires_at :datetime
 #  private    :boolean          default(TRUE), not null
diff --git a/app/models/service_hook.rb b/app/models/service_hook.rb
index 433e8059788..4cd2b272eec 100644
--- a/app/models/service_hook.rb
+++ b/app/models/service_hook.rb
@@ -5,8 +5,8 @@
 #  id         :integer          not null, primary key
 #  url        :string(255)
 #  project_id :integer
-#  created_at :datetime
-#  updated_at :datetime
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
 #  type       :string(255)      default("ProjectHook")
 #  service_id :integer
 #
diff --git a/app/models/snippet.rb b/app/models/snippet.rb
index 3a2fc17e59c..edc179b20fd 100644
--- a/app/models/snippet.rb
+++ b/app/models/snippet.rb
@@ -4,11 +4,11 @@
 #
 #  id         :integer          not null, primary key
 #  title      :string(255)
-#  content    :text
+#  content    :text(2147483647)
 #  author_id  :integer          not null
 #  project_id :integer
-#  created_at :datetime
-#  updated_at :datetime
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
 #  file_name  :string(255)
 #  expires_at :datetime
 #  private    :boolean          default(TRUE), not null
diff --git a/app/models/system_hook.rb b/app/models/system_hook.rb
index 2d28f4cd452..5cdf046644f 100644
--- a/app/models/system_hook.rb
+++ b/app/models/system_hook.rb
@@ -5,8 +5,8 @@
 #  id         :integer          not null, primary key
 #  url        :string(255)
 #  project_id :integer
-#  created_at :datetime
-#  updated_at :datetime
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
 #  type       :string(255)      default("ProjectHook")
 #  service_id :integer
 #
diff --git a/app/models/user.rb b/app/models/user.rb
index a0637b522d0..071f6f30f5a 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -4,7 +4,7 @@
 #
 #  id                     :integer          not null, primary key
 #  email                  :string(255)      default(""), not null
-#  encrypted_password     :string(128)      default(""), not null
+#  encrypted_password     :string(255)      default(""), not null
 #  reset_password_token   :string(255)
 #  reset_password_sent_at :datetime
 #  remember_created_at    :datetime
@@ -13,8 +13,8 @@
 #  last_sign_in_at        :datetime
 #  current_sign_in_ip     :string(255)
 #  last_sign_in_ip        :string(255)
-#  created_at             :datetime
-#  updated_at             :datetime
+#  created_at             :datetime         not null
+#  updated_at             :datetime         not null
 #  name                   :string(255)
 #  admin                  :boolean          default(FALSE), not null
 #  projects_limit         :integer          default(10)
diff --git a/app/models/users_group.rb b/app/models/users_group.rb
index 3686551830d..181bf322283 100644
--- a/app/models/users_group.rb
+++ b/app/models/users_group.rb
@@ -2,12 +2,13 @@
 #
 # Table name: users_groups
 #
-#  id           :integer          not null, primary key
-#  group_access :integer          not null
-#  group_id     :integer          not null
-#  user_id      :integer          not null
-#  created_at   :datetime         not null
-#  updated_at   :datetime         not null
+#  id                 :integer          not null, primary key
+#  group_access       :integer          not null
+#  group_id           :integer          not null
+#  user_id            :integer          not null
+#  created_at         :datetime         not null
+#  updated_at         :datetime         not null
+#  notification_level :integer          default(3), not null
 #
 
 class UsersGroup < ActiveRecord::Base
diff --git a/app/models/users_project.rb b/app/models/users_project.rb
index 76f5685e047..c435df2b442 100644
--- a/app/models/users_project.rb
+++ b/app/models/users_project.rb
@@ -5,8 +5,8 @@
 #  id                 :integer          not null, primary key
 #  user_id            :integer          not null
 #  project_id         :integer          not null
-#  created_at         :datetime
-#  updated_at         :datetime
+#  created_at         :datetime         not null
+#  updated_at         :datetime         not null
 #  project_access     :integer          default(0), not null
 #  notification_level :integer          default(3), not null
 #
diff --git a/app/models/web_hook.rb b/app/models/web_hook.rb
index 1e6ea885ea9..3f22b1082fb 100644
--- a/app/models/web_hook.rb
+++ b/app/models/web_hook.rb
@@ -5,8 +5,8 @@
 #  id         :integer          not null, primary key
 #  url        :string(255)
 #  project_id :integer
-#  created_at :datetime
-#  updated_at :datetime
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
 #  type       :string(255)      default("ProjectHook")
 #  service_id :integer
 #
diff --git a/spec/factories/users_groups.rb b/spec/factories/users_groups.rb
index 654bb2caee8..34bc0c51468 100644
--- a/spec/factories/users_groups.rb
+++ b/spec/factories/users_groups.rb
@@ -2,12 +2,13 @@
 #
 # Table name: users_groups
 #
-#  id           :integer          not null, primary key
-#  group_access :integer          not null
-#  group_id     :integer          not null
-#  user_id      :integer          not null
-#  created_at   :datetime         not null
-#  updated_at   :datetime         not null
+#  id                 :integer          not null, primary key
+#  group_access       :integer          not null
+#  group_id           :integer          not null
+#  user_id            :integer          not null
+#  created_at         :datetime         not null
+#  updated_at         :datetime         not null
+#  notification_level :integer          default(3), not null
 #
 
 FactoryGirl.define do
diff --git a/spec/models/deploy_key_spec.rb b/spec/models/deploy_key_spec.rb
index ec1f5d2c4e2..b76ca660411 100644
--- a/spec/models/deploy_key_spec.rb
+++ b/spec/models/deploy_key_spec.rb
@@ -2,14 +2,14 @@
 #
 # Table name: keys
 #
-#  id         :integer          not null, primary key
-#  user_id    :integer
-#  created_at :datetime
-#  updated_at :datetime
-#  key        :text
-#  title      :string(255)
-#  identifier :string(255)
-#  type       :string(255)
+#  id          :integer          not null, primary key
+#  user_id     :integer
+#  created_at  :datetime         not null
+#  updated_at  :datetime         not null
+#  key         :text
+#  title       :string(255)
+#  type        :string(255)
+#  fingerprint :string(255)
 #
 
 require 'spec_helper'
diff --git a/spec/models/issue_spec.rb b/spec/models/issue_spec.rb
index fbdf4eb52eb..c10891331b1 100644
--- a/spec/models/issue_spec.rb
+++ b/spec/models/issue_spec.rb
@@ -7,13 +7,14 @@
 #  assignee_id  :integer
 #  author_id    :integer
 #  project_id   :integer
-#  created_at   :datetime
-#  updated_at   :datetime
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
 #  position     :integer          default(0)
 #  branch_name  :string(255)
 #  description  :text
 #  milestone_id :integer
 #  state        :string(255)
+#  iid          :integer
 #
 
 require 'spec_helper'
diff --git a/spec/models/key_spec.rb b/spec/models/key_spec.rb
index f4dd726331a..9c872c02a53 100644
--- a/spec/models/key_spec.rb
+++ b/spec/models/key_spec.rb
@@ -2,14 +2,14 @@
 #
 # Table name: keys
 #
-#  id         :integer          not null, primary key
-#  user_id    :integer
-#  created_at :datetime
-#  updated_at :datetime
-#  key        :text
-#  title      :string(255)
-#  identifier :string(255)
-#  type       :string(255)
+#  id          :integer          not null, primary key
+#  user_id     :integer
+#  created_at  :datetime         not null
+#  updated_at  :datetime         not null
+#  key         :text
+#  title       :string(255)
+#  type        :string(255)
+#  fingerprint :string(255)
 #
 
 require 'spec_helper'
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb
index 68f3f920e06..40931513af6 100644
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
@@ -2,20 +2,22 @@
 #
 # Table name: merge_requests
 #
-#  id            :integer          not null, primary key
-#  target_branch :string(255)      not null
-#  source_branch :string(255)      not null
-#  project_id    :integer          not null
-#  author_id     :integer
-#  assignee_id   :integer
-#  title         :string(255)
-#  created_at    :datetime
-#  updated_at    :datetime
-#  st_commits    :text(2147483647)
-#  st_diffs      :text(2147483647)
-#  milestone_id  :integer
-#  state         :string(255)
-#  merge_status  :string(255)
+#  id                :integer          not null, primary key
+#  target_branch     :string(255)      not null
+#  source_branch     :string(255)      not null
+#  source_project_id :integer          not null
+#  author_id         :integer
+#  assignee_id       :integer
+#  title             :string(255)
+#  created_at        :datetime         not null
+#  updated_at        :datetime         not null
+#  st_commits        :text(2147483647)
+#  st_diffs          :text(2147483647)
+#  milestone_id      :integer
+#  state             :string(255)
+#  merge_status      :string(255)
+#  target_project_id :integer          not null
+#  iid               :integer
 #
 
 require 'spec_helper'
diff --git a/spec/models/milestone_spec.rb b/spec/models/milestone_spec.rb
index 23b8a4aeae5..b41012a3b8c 100644
--- a/spec/models/milestone_spec.rb
+++ b/spec/models/milestone_spec.rb
@@ -10,6 +10,7 @@
 #  created_at  :datetime         not null
 #  updated_at  :datetime         not null
 #  state       :string(255)
+#  iid         :integer
 #
 
 require 'spec_helper'
diff --git a/spec/models/note_spec.rb b/spec/models/note_spec.rb
index 0f3af588457..646255543a0 100644
--- a/spec/models/note_spec.rb
+++ b/spec/models/note_spec.rb
@@ -6,13 +6,14 @@
 #  note          :text
 #  noteable_type :string(255)
 #  author_id     :integer
-#  created_at    :datetime
-#  updated_at    :datetime
+#  created_at    :datetime         not null
+#  updated_at    :datetime         not null
 #  project_id    :integer
 #  attachment    :string(255)
 #  line_code     :string(255)
 #  commit_id     :string(255)
 #  noteable_id   :integer
+#  st_diff       :text
 #
 
 require 'spec_helper'
diff --git a/spec/models/project_snippet_spec.rb b/spec/models/project_snippet_spec.rb
index 42147179387..d3a46ebbb84 100644
--- a/spec/models/project_snippet_spec.rb
+++ b/spec/models/project_snippet_spec.rb
@@ -4,11 +4,11 @@
 #
 #  id         :integer          not null, primary key
 #  title      :string(255)
-#  content    :text
+#  content    :text(2147483647)
 #  author_id  :integer          not null
 #  project_id :integer
-#  created_at :datetime
-#  updated_at :datetime
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
 #  file_name  :string(255)
 #  expires_at :datetime
 #  private    :boolean          default(TRUE), not null
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index bca2ad74249..172adb5fc7a 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -6,8 +6,8 @@
 #  name                   :string(255)
 #  path                   :string(255)
 #  description            :text
-#  created_at             :datetime
-#  updated_at             :datetime
+#  created_at             :datetime         not null
+#  updated_at             :datetime         not null
 #  creator_id             :integer
 #  default_branch         :string(255)
 #  issues_enabled         :boolean          default(TRUE), not null
@@ -21,6 +21,7 @@
 #  snippets_enabled       :boolean          default(TRUE), not null
 #  last_activity_at       :datetime
 #  imported               :boolean          default(FALSE), not null
+#  import_url             :string(255)
 #
 
 require 'spec_helper'
diff --git a/spec/models/service_hook_spec.rb b/spec/models/service_hook_spec.rb
index e5ba59c0d65..0b0262c97f1 100644
--- a/spec/models/service_hook_spec.rb
+++ b/spec/models/service_hook_spec.rb
@@ -5,8 +5,8 @@
 #  id         :integer          not null, primary key
 #  url        :string(255)
 #  project_id :integer
-#  created_at :datetime
-#  updated_at :datetime
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
 #  type       :string(255)      default("ProjectHook")
 #  service_id :integer
 #
diff --git a/spec/models/snippet_spec.rb b/spec/models/snippet_spec.rb
index a77c594aaf1..5fa397207c7 100644
--- a/spec/models/snippet_spec.rb
+++ b/spec/models/snippet_spec.rb
@@ -4,11 +4,11 @@
 #
 #  id         :integer          not null, primary key
 #  title      :string(255)
-#  content    :text
+#  content    :text(2147483647)
 #  author_id  :integer          not null
 #  project_id :integer
-#  created_at :datetime
-#  updated_at :datetime
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
 #  file_name  :string(255)
 #  expires_at :datetime
 #  private    :boolean          default(TRUE), not null
diff --git a/spec/models/system_hook_spec.rb b/spec/models/system_hook_spec.rb
index 7f11f9ec247..a9ed6a5fa7c 100644
--- a/spec/models/system_hook_spec.rb
+++ b/spec/models/system_hook_spec.rb
@@ -5,8 +5,8 @@
 #  id         :integer          not null, primary key
 #  url        :string(255)
 #  project_id :integer
-#  created_at :datetime
-#  updated_at :datetime
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
 #  type       :string(255)      default("ProjectHook")
 #  service_id :integer
 #
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index eb8ffa5aafe..6743f2d803f 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -4,7 +4,7 @@
 #
 #  id                     :integer          not null, primary key
 #  email                  :string(255)      default(""), not null
-#  encrypted_password     :string(128)      default(""), not null
+#  encrypted_password     :string(255)      default(""), not null
 #  reset_password_token   :string(255)
 #  reset_password_sent_at :datetime
 #  remember_created_at    :datetime
@@ -13,8 +13,8 @@
 #  last_sign_in_at        :datetime
 #  current_sign_in_ip     :string(255)
 #  last_sign_in_ip        :string(255)
-#  created_at             :datetime
-#  updated_at             :datetime
+#  created_at             :datetime         not null
+#  updated_at             :datetime         not null
 #  name                   :string(255)
 #  admin                  :boolean          default(FALSE), not null
 #  projects_limit         :integer          default(10)
diff --git a/spec/models/users_group_spec.rb b/spec/models/users_group_spec.rb
index 4da31a55fcb..9264f2bc034 100644
--- a/spec/models/users_group_spec.rb
+++ b/spec/models/users_group_spec.rb
@@ -2,12 +2,13 @@
 #
 # Table name: users_groups
 #
-#  id           :integer          not null, primary key
-#  group_access :integer          not null
-#  group_id     :integer          not null
-#  user_id      :integer          not null
-#  created_at   :datetime         not null
-#  updated_at   :datetime         not null
+#  id                 :integer          not null, primary key
+#  group_access       :integer          not null
+#  group_id           :integer          not null
+#  user_id            :integer          not null
+#  created_at         :datetime         not null
+#  updated_at         :datetime         not null
+#  notification_level :integer          default(3), not null
 #
 
 require 'spec_helper'
diff --git a/spec/models/users_project_spec.rb b/spec/models/users_project_spec.rb
index aa4b8cb449b..e289a592b03 100644
--- a/spec/models/users_project_spec.rb
+++ b/spec/models/users_project_spec.rb
@@ -5,8 +5,8 @@
 #  id                 :integer          not null, primary key
 #  user_id            :integer          not null
 #  project_id         :integer          not null
-#  created_at         :datetime
-#  updated_at         :datetime
+#  created_at         :datetime         not null
+#  updated_at         :datetime         not null
 #  project_access     :integer          default(0), not null
 #  notification_level :integer          default(3), not null
 #
diff --git a/spec/models/web_hook_spec.rb b/spec/models/web_hook_spec.rb
index 4f88ed849e0..2d9301732dd 100644
--- a/spec/models/web_hook_spec.rb
+++ b/spec/models/web_hook_spec.rb
@@ -5,8 +5,8 @@
 #  id         :integer          not null, primary key
 #  url        :string(255)
 #  project_id :integer
-#  created_at :datetime
-#  updated_at :datetime
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
 #  type       :string(255)      default("ProjectHook")
 #  service_id :integer
 #