Merge branch 'annotate-models' into 'master'

Re-annotate models

See merge request !1634

app/models/application_setting.rb

@@ -4,15 +4,15 @@
 #
 #  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
 #  home_page_url             :string(255)
+#  default_branch_protection :integer          default(2)
+#  twitter_sharing_enabled   :boolean          default(TRUE)
 #
 
 class ApplicationSetting < ActiveRecord::Base

app/models/identity.rb

@@ -6,6 +6,8 @@
 #  extern_uid :string(255)
 #  provider   :string(255)
 #  user_id    :integer
+#  created_at :datetime
+#  updated_at :datetime
 #
 
 class Identity < ActiveRecord::Base

app/models/project_services/buildbox_service.rb

@@ -16,6 +16,7 @@
 #  merge_requests_events :boolean          default(TRUE)
 #  tag_push_events       :boolean          default(TRUE)
 #
+
 require "addressable/uri"
 
 class BuildboxService < CiService

app/models/project_services/ci_service.rb

@@ -11,10 +11,10 @@
 #  active                :boolean          default(FALSE), not null
 #  properties            :text
 #  template              :boolean          default(FALSE)
-#  push_events           :boolean
-#  issues_events         :boolean
-#  merge_requests_events :boolean
-#  tag_push_events       :boolean
+#  push_events           :boolean          default(TRUE)
+#  issues_events         :boolean          default(TRUE)
+#  merge_requests_events :boolean          default(TRUE)
+#  tag_push_events       :boolean          default(TRUE)
 #
 
 # Base class for CI services

app/models/project_services/custom_issue_tracker_service.rb

@@ -11,6 +11,10 @@
 #  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)
 #
 
 class CustomIssueTrackerService < IssueTrackerService

app/models/project_services/emails_on_push_service.rb

@@ -11,10 +11,10 @@
 #  active                :boolean          default(FALSE), not null
 #  properties            :text
 #  template              :boolean          default(FALSE)
-#  push_events           :boolean
-#  issues_events         :boolean
-#  merge_requests_events :boolean
-#  tag_push_events       :boolean
+#  push_events           :boolean          default(TRUE)
+#  issues_events         :boolean          default(TRUE)
+#  merge_requests_events :boolean          default(TRUE)
+#  tag_push_events       :boolean          default(TRUE)
 #
 
 class EmailsOnPushService < Service

app/models/project_services/flowdock_service.rb

@@ -11,10 +11,10 @@
 #  active                :boolean          default(FALSE), not null
 #  properties            :text
 #  template              :boolean          default(FALSE)
-#  push_events           :boolean
-#  issues_events         :boolean
-#  merge_requests_events :boolean
-#  tag_push_events       :boolean
+#  push_events           :boolean          default(TRUE)
+#  issues_events         :boolean          default(TRUE)
+#  merge_requests_events :boolean          default(TRUE)
+#  tag_push_events       :boolean          default(TRUE)
 #
 
 require "flowdock-git-hook"

app/models/project_services/gemnasium_service.rb

@@ -11,10 +11,10 @@
 #  active                :boolean          default(FALSE), not null
 #  properties            :text
 #  template              :boolean          default(FALSE)
-#  push_events           :boolean
-#  issues_events         :boolean
-#  merge_requests_events :boolean
-#  tag_push_events       :boolean
+#  push_events           :boolean          default(TRUE)
+#  issues_events         :boolean          default(TRUE)
+#  merge_requests_events :boolean          default(TRUE)
+#  tag_push_events       :boolean          default(TRUE)
 #
 
 require "gemnasium/gitlab_service"

app/models/project_services/gitlab_ci_service.rb

@@ -11,10 +11,10 @@
 #  active                :boolean          default(FALSE), not null
 #  properties            :text
 #  template              :boolean          default(FALSE)
-#  push_events           :boolean
-#  issues_events         :boolean
-#  merge_requests_events :boolean
-#  tag_push_events       :boolean
+#  push_events           :boolean          default(TRUE)
+#  issues_events         :boolean          default(TRUE)
+#  merge_requests_events :boolean          default(TRUE)
+#  tag_push_events       :boolean          default(TRUE)
 #
 
 class GitlabCiService < CiService

app/models/project_services/hipchat_service.rb

@@ -11,10 +11,10 @@
 #  active                :boolean          default(FALSE), not null
 #  properties            :text
 #  template              :boolean          default(FALSE)
-#  push_events           :boolean
-#  issues_events         :boolean
-#  merge_requests_events :boolean
-#  tag_push_events       :boolean
+#  push_events           :boolean          default(TRUE)
+#  issues_events         :boolean          default(TRUE)
+#  merge_requests_events :boolean          default(TRUE)
+#  tag_push_events       :boolean          default(TRUE)
 #
 
 class HipchatService < Service

app/models/project_services/irker_service.rb

@@ -11,6 +11,11 @@
 #  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)
+#
 
 require 'uri'
 

app/models/service.rb

@@ -11,10 +11,10 @@
 #  active                :boolean          default(FALSE), not null
 #  properties            :text
 #  template              :boolean          default(FALSE)
-#  push_events           :boolean
-#  issues_events         :boolean
-#  merge_requests_events :boolean
-#  tag_push_events       :boolean
+#  push_events           :boolean          default(TRUE)
+#  issues_events         :boolean          default(TRUE)
+#  merge_requests_events :boolean          default(TRUE)
+#  tag_push_events       :boolean          default(TRUE)
 #
 
 # To add new service you should build a class inherited from Service

app/models/user.rb

@@ -34,19 +34,21 @@
 #  notification_level            :integer          default(1), not null
 #  password_expires_at           :datetime
 #  created_by_id                 :integer
+#  last_credential_check_at      :datetime
 #  avatar                        :string(255)
 #  confirmation_token            :string(255)
 #  confirmed_at                  :datetime
 #  confirmation_sent_at          :datetime
 #  unconfirmed_email             :string(255)
 #  hide_no_ssh_key               :boolean          default(FALSE)
-#  hide_no_password         :boolean          default(FALSE)
 #  website_url                   :string(255)      default(""), not null
-#  last_credential_check_at :datetime
 #  github_access_token           :string(255)
+#  gitlab_access_token           :string(255)
 #  notification_email            :string(255)
+#  hide_no_password              :boolean          default(FALSE)
 #  password_automatically_set    :boolean          default(FALSE)
 #  bitbucket_access_token        :string(255)
+#  bitbucket_access_token_secret :string(255)
 #
 
 require 'carrierwave/orm/activerecord'

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
@@ -12,6 +11,8 @@
 #  created_at                :datetime
 #  updated_at                :datetime
 #  home_page_url             :string(255)
+#  default_branch_protection :integer          default(2)
+#  twitter_sharing_enabled   :boolean          default(TRUE)
 #
 
 require 'spec_helper'

spec/models/asana_service_spec.rb

@@ -5,11 +5,16 @@
 #  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)
 #
 
 require 'spec_helper'

spec/models/project_services/assembla_service_spec.rb

@@ -5,15 +5,16 @@
 #  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
-#  push_events           :boolean
-#  issues_events         :boolean
-#  merge_requests_events :boolean
-#  tag_push_events       :boolean
+#  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)
 #
 
 require 'spec_helper'

spec/models/project_services/buildbox_service_spec.rb

@@ -5,15 +5,16 @@
 #  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
-#  push_events           :boolean
-#  issues_events         :boolean
-#  merge_requests_events :boolean
-#  tag_push_events       :boolean
+#  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)
 #
 
 require 'spec_helper'

spec/models/project_services/flowdock_service_spec.rb

@@ -5,15 +5,16 @@
 #  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
-#  push_events           :boolean
-#  issues_events         :boolean
-#  merge_requests_events :boolean
-#  tag_push_events       :boolean
+#  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)
 #
 
 require 'spec_helper'

spec/models/project_services/gemnasium_service_spec.rb

@@ -5,15 +5,16 @@
 #  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
-#  push_events           :boolean
-#  issues_events         :boolean
-#  merge_requests_events :boolean
-#  tag_push_events       :boolean
+#  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)
 #
 
 require 'spec_helper'

spec/models/project_services/gitlab_ci_service_spec.rb

@@ -5,15 +5,16 @@
 #  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
-#  push_events           :boolean
-#  issues_events         :boolean
-#  merge_requests_events :boolean
-#  tag_push_events       :boolean
+#  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)
 #
 
 require 'spec_helper'

spec/models/project_services/gitlab_issue_tracker_service_spec.rb

@@ -11,7 +11,12 @@
 #  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)
 #
+
 require 'spec_helper'
 
 describe GitlabIssueTrackerService do

spec/models/project_services/irker_service_spec.rb

@@ -5,11 +5,16 @@
 #  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)
 #
 
 require 'spec_helper'

spec/models/project_services/jira_service_spec.rb

@@ -5,11 +5,16 @@
 #  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)
 #
 
 require 'spec_helper'

spec/models/project_services/pushover_service_spec.rb

@@ -5,15 +5,16 @@
 #  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
-#  push_events           :boolean
-#  issues_events         :boolean
-#  merge_requests_events :boolean
-#  tag_push_events       :boolean
+#  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)
 #
 
 require 'spec_helper'

spec/models/project_services/slack_service_spec.rb

@@ -5,15 +5,16 @@
 #  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
-#  push_events           :boolean
-#  issues_events         :boolean
-#  merge_requests_events :boolean
-#  tag_push_events       :boolean
+#  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)
 #
 
 require 'spec_helper'

spec/models/service_spec.rb

@@ -11,10 +11,10 @@
 #  active                :boolean          default(FALSE), not null
 #  properties            :text
 #  template              :boolean          default(FALSE)
-#  push_events           :boolean
-#  issues_events         :boolean
-#  merge_requests_events :boolean
-#  tag_push_events       :boolean
+#  push_events           :boolean          default(TRUE)
+#  issues_events         :boolean          default(TRUE)
+#  merge_requests_events :boolean          default(TRUE)
+#  tag_push_events       :boolean          default(TRUE)
 #
 
 require 'spec_helper'

spec/models/user_spec.rb

@@ -34,6 +34,7 @@
 #  notification_level            :integer          default(1), not null
 #  password_expires_at           :datetime
 #  created_by_id                 :integer
+#  last_credential_check_at      :datetime
 #  avatar                        :string(255)
 #  confirmation_token            :string(255)
 #  confirmed_at                  :datetime
@@ -41,8 +42,13 @@
 #  unconfirmed_email             :string(255)
 #  hide_no_ssh_key               :boolean          default(FALSE)
 #  website_url                   :string(255)      default(""), not null
-#  last_credential_check_at :datetime
 #  github_access_token           :string(255)
+#  gitlab_access_token           :string(255)
+#  notification_email            :string(255)
+#  hide_no_password              :boolean          default(FALSE)
+#  password_automatically_set    :boolean          default(FALSE)
+#  bitbucket_access_token        :string(255)
+#  bitbucket_access_token_secret :string(255)
 #
 
 require 'spec_helper'