Re-annotate models

18 files changed, 46 insertions, 22 deletions

diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb
index f2cebde9705..d5123249c53 100644
--- a/app/models/application_setting.rb
+++ b/app/models/application_setting.rb
@@ -2,13 +2,11 @@
 #
 # Table name: application_settings
 #
-#  id                           :integer        not null, primary key
+#  id                           :integer          not null, primary key
 #  default_projects_limit       :integer
-#  default_branch_protection    :integer
 #  signup_enabled               :boolean
 #  signin_enabled               :boolean
 #  gravatar_enabled             :boolean
-#  twitter_sharing_enabled      :boolean
 #  sign_in_text                 :text
 #  created_at                   :datetime
 #  updated_at                   :datetime
@@ -16,8 +14,9 @@
 #  default_branch_protection    :integer          default(2)
 #  twitter_sharing_enabled      :boolean          default(TRUE)
 #  restricted_visibility_levels :text
-#  max_attachment_size          :integer          default(10)
+#  max_attachment_size          :integer          default(10), not null
 #  default_project_visibility   :integer
+#  default_snippet_visibility   :integer
 #  restricted_signup_domains    :text
 #
 
diff --git a/app/models/deploy_key.rb b/app/models/deploy_key.rb
index 85d52d558cd..9ab663c04ad 100644
--- a/app/models/deploy_key.rb
+++ b/app/models/deploy_key.rb
@@ -7,10 +7,10 @@
 #  created_at  :datetime
 #  updated_at  :datetime
 #  key         :text
-#  public      :boolean          default(FALSE)
 #  title       :string(255)
 #  type        :string(255)
 #  fingerprint :string(255)
+#  public      :boolean          default(FALSE), not null
 #
 
 class DeployKey < Key
diff --git a/app/models/key.rb b/app/models/key.rb
index 016eee86992..bbc28678177 100644
--- a/app/models/key.rb
+++ b/app/models/key.rb
@@ -10,6 +10,7 @@
 #  title       :string(255)
 #  type        :string(255)
 #  fingerprint :string(255)
+#  public      :boolean          default(FALSE), not null
 #
 
 require 'digest/md5'
diff --git a/app/models/member.rb b/app/models/member.rb
index d151c7b2390..cae8caa23fb 100644
--- a/app/models/member.rb
+++ b/app/models/member.rb
@@ -6,14 +6,14 @@
 #  access_level       :integer          not null
 #  source_id          :integer          not null
 #  source_type        :string(255)      not null
-#  user_id            :integer          not null
+#  user_id            :integer
 #  notification_level :integer          not null
 #  type               :string(255)
 #  created_at         :datetime
 #  updated_at         :datetime
 #  created_by_id      :integer
-#  invite_email       :string
-#  invite_token       :string
+#  invite_email       :string(255)
+#  invite_token       :string(255)
 #  invite_accepted_at :datetime
 #
 
diff --git a/app/models/members/group_member.rb b/app/models/members/group_member.rb
index 84c91372b3f..65d2ea00570 100644
--- a/app/models/members/group_member.rb
+++ b/app/models/members/group_member.rb
@@ -6,11 +6,15 @@
 #  access_level       :integer          not null
 #  source_id          :integer          not null
 #  source_type        :string(255)      not null
-#  user_id            :integer          not null
+#  user_id            :integer
 #  notification_level :integer          not null
 #  type               :string(255)
 #  created_at         :datetime
 #  updated_at         :datetime
+#  created_by_id      :integer
+#  invite_email       :string(255)
+#  invite_token       :string(255)
+#  invite_accepted_at :datetime
 #
 
 class GroupMember < Member
diff --git a/app/models/members/project_member.rb b/app/models/members/project_member.rb
index 0a3b4d2182b..1b0c76917aa 100644
--- a/app/models/members/project_member.rb
+++ b/app/models/members/project_member.rb
@@ -6,11 +6,15 @@
 #  access_level       :integer          not null
 #  source_id          :integer          not null
 #  source_type        :string(255)      not null
-#  user_id            :integer          not null
+#  user_id            :integer
 #  notification_level :integer          not null
 #  type               :string(255)
 #  created_at         :datetime
 #  updated_at         :datetime
+#  created_by_id      :integer
+#  invite_email       :string(255)
+#  invite_token       :string(255)
+#  invite_accepted_at :datetime
 #
 
 class ProjectMember < Member
diff --git a/app/models/project_import_data.rb b/app/models/project_import_data.rb
index 6a8a8a56eb5..cd3319f077e 100644
--- a/app/models/project_import_data.rb
+++ b/app/models/project_import_data.rb
@@ -1,10 +1,10 @@
 # == Schema Information
 #
-# Table name: project_import_datas
+# Table name: project_import_data
 #
-#  id           :integer          not null, primary key
-#  project_id   :integer
-#  data         :text
+#  id         :integer          not null, primary key
+#  project_id :integer
+#  data       :text
 #
 
 require 'carrierwave/orm/activerecord'
diff --git a/app/models/project_services/ci_service.rb b/app/models/project_services/ci_service.rb
index 1a36e439245..77d48d4af5e 100644
--- a/app/models/project_services/ci_service.rb
+++ b/app/models/project_services/ci_service.rb
@@ -15,6 +15,7 @@
 #  issues_events         :boolean          default(TRUE)
 #  merge_requests_events :boolean          default(TRUE)
 #  tag_push_events       :boolean          default(TRUE)
+#  note_events           :boolean          default(TRUE), not null
 #
 
 # Base class for CI services
diff --git a/app/models/project_services/custom_issue_tracker_service.rb b/app/models/project_services/custom_issue_tracker_service.rb
index 8d25f627870..7c2027c18e6 100644
--- a/app/models/project_services/custom_issue_tracker_service.rb
+++ b/app/models/project_services/custom_issue_tracker_service.rb
@@ -15,6 +15,7 @@
 #  issues_events         :boolean          default(TRUE)
 #  merge_requests_events :boolean          default(TRUE)
 #  tag_push_events       :boolean          default(TRUE)
+#  note_events           :boolean          default(TRUE), not null
 #
 
 class CustomIssueTrackerService < IssueTrackerService
diff --git a/app/models/project_services/emails_on_push_service.rb b/app/models/project_services/emails_on_push_service.rb
index 6f6e5950aab..8f5d8b086eb 100644
--- a/app/models/project_services/emails_on_push_service.rb
+++ b/app/models/project_services/emails_on_push_service.rb
@@ -15,6 +15,7 @@
 #  issues_events         :boolean          default(TRUE)
 #  merge_requests_events :boolean          default(TRUE)
 #  tag_push_events       :boolean          default(TRUE)
+#  note_events           :boolean          default(TRUE), not null
 #
 
 class EmailsOnPushService < Service
diff --git a/app/models/project_services/external_wiki_service.rb b/app/models/project_services/external_wiki_service.rb
index a199d0e86f2..9c46af7e721 100644
--- a/app/models/project_services/external_wiki_service.rb
+++ b/app/models/project_services/external_wiki_service.rb
@@ -2,14 +2,20 @@
 #
 # Table name: services
 #
-#  id         :integer          not null, primary key
-#  type       :string(255)
-#  title      :string(255)
-#  project_id :integer          not null
-#  created_at :datetime
-#  updated_at :datetime
-#  active     :boolean          default(FALSE), not null
-#  properties :text
+#  id                    :integer          not null, primary key
+#  type                  :string(255)
+#  title                 :string(255)
+#  project_id            :integer
+#  created_at            :datetime
+#  updated_at            :datetime
+#  active                :boolean          default(FALSE), not null
+#  properties            :text
+#  template              :boolean          default(FALSE)
+#  push_events           :boolean          default(TRUE)
+#  issues_events         :boolean          default(TRUE)
+#  merge_requests_events :boolean          default(TRUE)
+#  tag_push_events       :boolean          default(TRUE)
+#  note_events           :boolean          default(TRUE), not null
 #
 
 class ExternalWikiService < Service
diff --git a/app/models/project_services/flowdock_service.rb b/app/models/project_services/flowdock_service.rb
index 99e361dd6ed..bf801ba61ad 100644
--- a/app/models/project_services/flowdock_service.rb
+++ b/app/models/project_services/flowdock_service.rb
@@ -15,6 +15,7 @@
 #  issues_events         :boolean          default(TRUE)
 #  merge_requests_events :boolean          default(TRUE)
 #  tag_push_events       :boolean          default(TRUE)
+#  note_events           :boolean          default(TRUE), not null
 #
 
 require "flowdock-git-hook"
diff --git a/app/models/project_services/gemnasium_service.rb b/app/models/project_services/gemnasium_service.rb
index 4e75bdfc953..91ef267ad79 100644
--- a/app/models/project_services/gemnasium_service.rb
+++ b/app/models/project_services/gemnasium_service.rb
@@ -15,6 +15,7 @@
 #  issues_events         :boolean          default(TRUE)
 #  merge_requests_events :boolean          default(TRUE)
 #  tag_push_events       :boolean          default(TRUE)
+#  note_events           :boolean          default(TRUE), not null
 #
 
 require "gemnasium/gitlab_service"
diff --git a/app/models/project_services/gitlab_ci_service.rb b/app/models/project_services/gitlab_ci_service.rb
index 0f9838a575d..f95bd79dfd6 100644
--- a/app/models/project_services/gitlab_ci_service.rb
+++ b/app/models/project_services/gitlab_ci_service.rb
@@ -15,6 +15,7 @@
 #  issues_events         :boolean          default(TRUE)
 #  merge_requests_events :boolean          default(TRUE)
 #  tag_push_events       :boolean          default(TRUE)
+#  note_events           :boolean          default(TRUE), not null
 #
 
 class GitlabCiService < CiService
diff --git a/app/models/project_services/hipchat_service.rb b/app/models/project_services/hipchat_service.rb
index 3a15b2207ea..38cb64f8c48 100644
--- a/app/models/project_services/hipchat_service.rb
+++ b/app/models/project_services/hipchat_service.rb
@@ -15,6 +15,7 @@
 #  issues_events         :boolean          default(TRUE)
 #  merge_requests_events :boolean          default(TRUE)
 #  tag_push_events       :boolean          default(TRUE)
+#  note_events           :boolean          default(TRUE), not null
 #
 
 class HipchatService < Service
diff --git a/app/models/project_services/irker_service.rb b/app/models/project_services/irker_service.rb
index e9e1e276e7d..89f312e8c98 100644
--- a/app/models/project_services/irker_service.rb
+++ b/app/models/project_services/irker_service.rb
@@ -15,6 +15,7 @@
 #  issues_events         :boolean          default(TRUE)
 #  merge_requests_events :boolean          default(TRUE)
 #  tag_push_events       :boolean          default(TRUE)
+#  note_events           :boolean          default(TRUE), not null
 #
 
 require 'uri'
diff --git a/app/models/service.rb b/app/models/service.rb
index 393cf55a69f..818a6808db5 100644
--- a/app/models/service.rb
+++ b/app/models/service.rb
@@ -15,6 +15,7 @@
 #  issues_events         :boolean          default(TRUE)
 #  merge_requests_events :boolean          default(TRUE)
 #  tag_push_events       :boolean          default(TRUE)
+#  note_events           :boolean          default(TRUE), not null
 #
 
 # To add new service you should build a class inherited from Service
diff --git a/app/models/user.rb b/app/models/user.rb
index 9f198368129..1cf7cfea974 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -49,6 +49,7 @@
 #  password_automatically_set    :boolean          default(FALSE)
 #  bitbucket_access_token        :string(255)
 #  bitbucket_access_token_secret :string(255)
+#  location                      :string(255)
 #  public_email                  :string(255)      default(""), not null
 #