diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb
index f2cebde970557eb4a4585d137646c6d207a46020..d5123249c53a1f1f513152fa71d17da6b5ee631a 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 85d52d558cd0a8730ca53e5a84c50f75cb68eb62..9ab663c04ad926be03cf412eed596472f0885d5b 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 016eee86992e51e11cd98f8238f3a701059e52b7..bbc286781772cc995f79894f122298819bdaaf74 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 d151c7b2390b9b637b5e79ea7d26cdfced395ace..cae8caa23fb2770299ee935b82f48edecd22f39b 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 84c91372b3f6469c5d1228fb9efb3584f314b8af..65d2ea00570db9e0a440ea872c382f67f0504cd2 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 0a3b4d2182b2d8a2196cd45eb46627b2bc5c80ed..1b0c76917aa377d47abb47c2be4716fe5c8a9976 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 6a8a8a56eb5874653265aa820300de5847524cb8..cd3319f077e136f07d934875c14593202ce52ca6 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 1a36e439245c1d7ef3cba67f84e2d666074431da..77d48d4af5ee9b87949a01099ba1919c5e24382a 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 8d25f6278709b42cd768127beab4af769f416669..7c2027c18e647300861540481af826cb4cf9c577 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 6f6e5950aab3575b00cc53f9030e4946003dd46b..8f5d8b086eb3fc66d86b744c1f635f3d065c30e5 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 a199d0e86f2ce43f94fbff1516761856ed729690..9c46af7e7213f08f30e47c1668ae74e99cff6824 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 99e361dd6ed18361d59ae4fb5b54fe76f0ae32e3..bf801ba61addff6284091e6510dfb56a96102733 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 4e75bdfc953eec9ee220cf00e505b07292f44dc9..91ef267ad79f11eee131fe5583f03fae602f1695 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 0f9838a575ddc7e4ee54a2d48d3159df95af24d9..f95bd79dfd6ce26ba12e690ba6afd3b166b53b97 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 3a15b2207eaac7e36b234f1d9658ca903f58cca5..38cb64f8c487d7751bd7b6f10adbed7ca6263c86 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 e9e1e276e7d690aaf3c0dcc71bbc8c83e10eeadb..89f312e8c98ec6ab10d5d16cf79c8239b0f5cb8d 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 393cf55a69f296f5e17c0bbbd1c7f877a9a6a19b..818a6808db5de4b6df5982af14fbb0f63c9e4a9f 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 9f198368129b133f5a6148690f95f795cae3588d..1cf7cfea974316cb3653d895db45d50834d9b426 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
 #
 
diff --git a/spec/models/application_setting_spec.rb b/spec/models/application_setting_spec.rb
index 876502d03c28d9354e3857f875ae0675c418382f..116c318121dcd1ce079f178e0b53088bf04e952a 100644
--- a/spec/models/application_setting_spec.rb
+++ b/spec/models/application_setting_spec.rb
@@ -4,7 +4,6 @@
 #
 #  id                           :integer          not null, primary key
 #  default_projects_limit       :integer
-#  default_branch_protection    :integer
 #  signup_enabled               :boolean
 #  signin_enabled               :boolean
 #  gravatar_enabled             :boolean
@@ -15,6 +14,10 @@
 #  default_branch_protection    :integer          default(2)
 #  twitter_sharing_enabled      :boolean          default(TRUE)
 #  restricted_visibility_levels :text
+#  max_attachment_size          :integer          default(10), not null
+#  default_project_visibility   :integer
+#  default_snippet_visibility   :integer
+#  restricted_signup_domains    :text
 #
 
 require 'spec_helper'
diff --git a/spec/models/deploy_key_spec.rb b/spec/models/deploy_key_spec.rb
index b32be8d7a7cb45199703192cf0c8d2f4fbcd8d55..957299324595f1fbcfeb5b6308958dc64475a60b 100644
--- a/spec/models/deploy_key_spec.rb
+++ b/spec/models/deploy_key_spec.rb
@@ -10,6 +10,7 @@
 #  title       :string(255)
 #  type        :string(255)
 #  fingerprint :string(255)
+#  public      :boolean          default(FALSE), not null
 #
 
 require 'spec_helper'
diff --git a/spec/models/external_wiki_service_spec.rb b/spec/models/external_wiki_service_spec.rb
index 78ef687d29cbeec644b45d8cc267e782939ae802..f2e77fc88c43dd9160a22cf51ddcc64a0cac594b 100644
--- a/spec/models/external_wiki_service_spec.rb
+++ b/spec/models/external_wiki_service_spec.rb
@@ -1,3 +1,23 @@
+# == Schema Information
+#
+# Table name: services
+#
+#  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
+#
+
 require 'spec_helper'
 
 describe ExternalWikiService do
diff --git a/spec/models/key_spec.rb b/spec/models/key_spec.rb
index 2fb651bef1b2e15235040cc3a2ed66229a21a653..6eb1208a7f25872f587aa19b04eb69df2ff593a2 100644
--- a/spec/models/key_spec.rb
+++ b/spec/models/key_spec.rb
@@ -10,6 +10,7 @@
 #  title       :string(255)
 #  type        :string(255)
 #  fingerprint :string(255)
+#  public      :boolean          default(FALSE), not null
 #
 
 require 'spec_helper'
diff --git a/spec/models/member_spec.rb b/spec/models/member_spec.rb
index 56d030a03b35a7bd6d1538e1ecde1b93f80518c1..57f840c1e9164d726ee1fc449c9a38d3747c1bfa 100644
--- a/spec/models/member_spec.rb
+++ b/spec/models/member_spec.rb
@@ -1,3 +1,22 @@
+# == Schema Information
+#
+# Table name: members
+#
+#  id                 :integer          not null, primary key
+#  access_level       :integer          not null
+#  source_id          :integer          not null
+#  source_type        :string(255)      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
+#
+
 require 'spec_helper'
 
 describe Member do
diff --git a/spec/models/members/group_member_spec.rb b/spec/models/members/group_member_spec.rb
index e206c11f33ae43bb117f1d899307cd60de1a8e08..7c10c9f0f4861490dadd899b6a24a1df1e304872 100644
--- a/spec/models/members/group_member_spec.rb
+++ b/spec/models/members/group_member_spec.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
 #
 
 require 'spec_helper'
diff --git a/spec/models/members/project_member_spec.rb b/spec/models/members/project_member_spec.rb
index 521721f3577ee2cba82abdc7c9b4a88fe3131ee7..5c72cfe1d6a0bcfa6efc317d522708b8cf009f20 100644
--- a/spec/models/members/project_member_spec.rb
+++ b/spec/models/members/project_member_spec.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
 #
 
 require 'spec_helper'
diff --git a/spec/models/project_services/asana_service_spec.rb b/spec/models/project_services/asana_service_spec.rb
index 13c8d54a2af522664582b7ce487b50a9a84e5235..cc1f99e0c72812303edca79d9f47595e5eddbc56 100644
--- a/spec/models/project_services/asana_service_spec.rb
+++ b/spec/models/project_services/asana_service_spec.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 'spec_helper'
diff --git a/spec/models/project_services/assembla_service_spec.rb b/spec/models/project_services/assembla_service_spec.rb
index 91730da1eecdbdf7d6ec85e8dca5d8a14eb649b9..9aee754dd63b69ccf69d280ff43d694e69f9b652 100644
--- a/spec/models/project_services/assembla_service_spec.rb
+++ b/spec/models/project_services/assembla_service_spec.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 'spec_helper'
diff --git a/spec/models/project_services/buildkite_service_spec.rb b/spec/models/project_services/buildkite_service_spec.rb
index e987241f3cabadf3c2f7aeb6975159a0a5ed3a0b..6db54243eac57b70b32f9adb7a4909077376f4e0 100644
--- a/spec/models/project_services/buildkite_service_spec.rb
+++ b/spec/models/project_services/buildkite_service_spec.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 'spec_helper'
diff --git a/spec/models/project_services/flowdock_service_spec.rb b/spec/models/project_services/flowdock_service_spec.rb
index 73f68301a34e309a8ff7b76b587875964c6005bb..e6e8fbba6a7f376c427ee38aa7d103540e559e87 100644
--- a/spec/models/project_services/flowdock_service_spec.rb
+++ b/spec/models/project_services/flowdock_service_spec.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 'spec_helper'
diff --git a/spec/models/project_services/gemnasium_service_spec.rb b/spec/models/project_services/gemnasium_service_spec.rb
index d44064bbe6a14f839eb857b9fe9f495b3a3d788c..1a7765e5c2a331fa2a31c04cd4ca2f3c3d78d8fa 100644
--- a/spec/models/project_services/gemnasium_service_spec.rb
+++ b/spec/models/project_services/gemnasium_service_spec.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 'spec_helper'
diff --git a/spec/models/project_services/gitlab_ci_service_spec.rb b/spec/models/project_services/gitlab_ci_service_spec.rb
index 6a557d839caaeef9575c9d4ba19dced6591befbf..afacd4afaf4756dd4ba713adf90d2a9f60121792 100644
--- a/spec/models/project_services/gitlab_ci_service_spec.rb
+++ b/spec/models/project_services/gitlab_ci_service_spec.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 'spec_helper'
diff --git a/spec/models/project_services/gitlab_issue_tracker_service_spec.rb b/spec/models/project_services/gitlab_issue_tracker_service_spec.rb
index f94bef5c3659f4f7e2914af185032c211b58bdf0..e34ca09bffc94f9afac55b7cde8e21e594140ad2 100644
--- a/spec/models/project_services/gitlab_issue_tracker_service_spec.rb
+++ b/spec/models/project_services/gitlab_issue_tracker_service_spec.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 'spec_helper'
diff --git a/spec/models/project_services/hipchat_service_spec.rb b/spec/models/project_services/hipchat_service_spec.rb
index 348f83c56ad5a20221d7b166e07d79a82a05fec5..bbaf54488befde05ced39b20f517a1065c716f0a 100644
--- a/spec/models/project_services/hipchat_service_spec.rb
+++ b/spec/models/project_services/hipchat_service_spec.rb
@@ -5,15 +5,17 @@
 #  id                    :integer          not null, primary key
 #  type                  :string(255)
 #  title                 :string(255)
-#  project_id            :integer          not null
+#  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
 #
 
 require 'spec_helper'
diff --git a/spec/models/project_services/irker_service_spec.rb b/spec/models/project_services/irker_service_spec.rb
index d55399bc360102ea6037502ce6adba53013dea4e..49face26bb4e3522a7396c6109783595e29f2480 100644
--- a/spec/models/project_services/irker_service_spec.rb
+++ b/spec/models/project_services/irker_service_spec.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 'spec_helper'
diff --git a/spec/models/project_services/jira_service_spec.rb b/spec/models/project_services/jira_service_spec.rb
index 355911e637771a8227faac071953896ec239e5a5..ddd2cce212c5750bd3e35143a40c179cddb8ab34 100644
--- a/spec/models/project_services/jira_service_spec.rb
+++ b/spec/models/project_services/jira_service_spec.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 'spec_helper'
diff --git a/spec/models/project_services/pushover_service_spec.rb b/spec/models/project_services/pushover_service_spec.rb
index 5a18fd09bfc95caf51c590106bb2ee9effbe647c..5f93703b50a2ceb4d41c699b9090162496b24d75 100644
--- a/spec/models/project_services/pushover_service_spec.rb
+++ b/spec/models/project_services/pushover_service_spec.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 'spec_helper'
diff --git a/spec/models/project_services/slack_service_spec.rb b/spec/models/project_services/slack_service_spec.rb
index c36506644b30c74508a91abaf5e44357a7d9ad7c..e9105677d23ebb2fd9f435304d03d85011a0e11b 100644
--- a/spec/models/project_services/slack_service_spec.rb
+++ b/spec/models/project_services/slack_service_spec.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 'spec_helper'
diff --git a/spec/models/service_spec.rb b/spec/models/service_spec.rb
index 735652aea78e496cedfe441133218de6f66fec96..5d4827ce92aa49323226cffdeea4101c670b54e4 100644
--- a/spec/models/service_spec.rb
+++ b/spec/models/service_spec.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 'spec_helper'
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 441aa7931330789d31184ff9e6f00d24d7180cb3..771709c127a34c68280ce63128d095d790fd42ae 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -49,6 +49,8 @@
 #  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
 #
 
 require 'spec_helper'