Merge branch 'annotate-models' into 'master'

app/models/hooks/project_hook.rb

@@ -17,6 +17,7 @@
 #  enable_ssl_verification :boolean          default(TRUE)
 #  build_events            :boolean          default(FALSE), not null
 #  wiki_page_events        :boolean          default(FALSE), not null
+#  token                   :string
 #
 
 class ProjectHook < WebHook

app/models/hooks/service_hook.rb

@@ -17,6 +17,7 @@
 #  enable_ssl_verification :boolean          default(TRUE)
 #  build_events            :boolean          default(FALSE), not null
 #  wiki_page_events        :boolean          default(FALSE), not null
+#  token                   :string
 #
 
 class ServiceHook < WebHook

app/models/hooks/system_hook.rb

@@ -17,6 +17,7 @@
 #  enable_ssl_verification :boolean          default(TRUE)
 #  build_events            :boolean          default(FALSE), not null
 #  wiki_page_events        :boolean          default(FALSE), not null
+#  token                   :string
 #
 
 class SystemHook < WebHook

app/models/hooks/web_hook.rb

@@ -17,6 +17,7 @@
 #  enable_ssl_verification :boolean          default(TRUE)
 #  build_events            :boolean          default(FALSE), not null
 #  wiki_page_events        :boolean          default(FALSE), not null
+#  token                   :string
 #
 
 class WebHook < ActiveRecord::Base

app/models/project_import_data.rb

@@ -6,8 +6,8 @@
 #  project_id                 :integer
 #  data                       :text
 #  encrypted_credentials      :text
-#  encrypted_credentials_iv   :text
-#  encrypted_credentials_salt :text
+#  encrypted_credentials_iv   :string
+#  encrypted_credentials_salt :string
 #
 
 require 'carrierwave/orm/activerecord'