reannotated

17 files changed, 56 insertions, 49 deletions

diff --git a/app/models/group.rb b/app/models/group.rb
index 7651ce23cb6..5d838d2b9b0 100644
--- a/app/models/group.rb
+++ b/app/models/group.rb
@@ -4,12 +4,12 @@
 #
 #  id          :integer          not null, primary key
 #  name        :string(255)      not null
-#  description :string(255)      not null
 #  path        :string(255)      not null
 #  owner_id    :integer          not null
 #  created_at  :datetime         not null
 #  updated_at  :datetime         not null
 #  type        :string(255)
+#  description :string(255)      default(""), not null
 #
 
 class Group < Namespace
diff --git a/app/models/issue.rb b/app/models/issue.rb
index f01cad0a458..54d9af7e67e 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -9,11 +9,11 @@
 #  project_id   :integer
 #  created_at   :datetime         not null
 #  updated_at   :datetime         not null
-#  state        :string           default(FALSE), not null
 #  position     :integer          default(0)
 #  branch_name  :string(255)
 #  description  :text
 #  milestone_id :integer
+#  state        :string(255)
 #
 
 class Issue < ActiveRecord::Base
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 354a95e9a93..9d42b1e1f32 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -9,14 +9,14 @@
 #  author_id     :integer
 #  assignee_id   :integer
 #  title         :string(255)
-#  state         :string(255)      not null
 #  created_at    :datetime         not null
 #  updated_at    :datetime         not null
 #  st_commits    :text(2147483647)
 #  st_diffs      :text(2147483647)
-#  merge_status  :integer          default(1), not null
-#
 #  milestone_id  :integer
+#  state         :string(255)
+#  merge_status  :string(255)
+#
 
 require Rails.root.join("app/models/commit")
 require Rails.root.join("lib/static_model")
diff --git a/app/models/milestone.rb b/app/models/milestone.rb
index d822a68dc7a..2a9b9e4482c 100644
--- a/app/models/milestone.rb
+++ b/app/models/milestone.rb
@@ -7,9 +7,9 @@
 #  project_id  :integer          not null
 #  description :text
 #  due_date    :date
-#  closed      :boolean          default(FALSE), not null
 #  created_at  :datetime         not null
 #  updated_at  :datetime         not null
+#  state       :string(255)
 #
 
 class Milestone < ActiveRecord::Base
diff --git a/app/models/namespace.rb b/app/models/namespace.rb
index c6b3e94d05d..e8b7d0c3706 100644
--- a/app/models/namespace.rb
+++ b/app/models/namespace.rb
@@ -4,12 +4,12 @@
 #
 #  id          :integer          not null, primary key
 #  name        :string(255)      not null
-#  description :string(255)      not null
 #  path        :string(255)      not null
 #  owner_id    :integer          not null
 #  created_at  :datetime         not null
 #  updated_at  :datetime         not null
 #  type        :string(255)
+#  description :string(255)      default(""), not null
 #
 
 class Namespace < ActiveRecord::Base
diff --git a/app/models/project.rb b/app/models/project.rb
index 07ba7fc369e..458ef18376c 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -11,12 +11,13 @@
 #  creator_id             :integer
 #  default_branch         :string(255)
 #  issues_enabled         :boolean          default(TRUE), not null
-#  issues_tracker         :string           not null
 #  wall_enabled           :boolean          default(TRUE), not null
 #  merge_requests_enabled :boolean          default(TRUE), not null
 #  wiki_enabled           :boolean          default(TRUE), not null
 #  namespace_id           :integer
 #  public                 :boolean          default(FALSE), not null
+#  issues_tracker         :string(255)      default("gitlab"), not null
+#  issues_tracker_id      :string(255)
 #
 
 require "grit"
diff --git a/app/models/user.rb b/app/models/user.rb
index 2b6eebf254f..c73353bf032 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -22,10 +22,8 @@
 #  linkedin               :string(255)      default(""), not null
 #  twitter                :string(255)      default(""), not null
 #  authentication_token   :string(255)
-#  dark_scheme            :boolean          default(FALSE), not null
 #  theme_id               :integer          default(1), not null
 #  bio                    :string(255)
-#  state                  :string(255)
 #  failed_attempts        :integer          default(0)
 #  locked_at              :datetime
 #  extern_uid             :string(255)
@@ -33,6 +31,8 @@
 #  username               :string(255)
 #  can_create_group       :boolean          default(TRUE), not null
 #  can_create_team        :boolean          default(TRUE), not null
+#  state                  :string(255)
+#  color_scheme_id        :integer          default(1), not null
 #
 
 class User < ActiveRecord::Base
diff --git a/app/models/user_team.rb b/app/models/user_team.rb
index d5b75851279..5de2ac6ae9e 100644
--- a/app/models/user_team.rb
+++ b/app/models/user_team.rb
@@ -2,12 +2,13 @@
 #
 # Table name: user_teams
 #
-#  id         :integer          not null, primary key
-#  name       :string(255)
-#  path       :string(255)
-#  owner_id   :integer
-#  created_at :datetime         not null
-#  updated_at :datetime         not null
+#  id          :integer          not null, primary key
+#  name        :string(255)
+#  path        :string(255)
+#  owner_id    :integer
+#  created_at  :datetime         not null
+#  updated_at  :datetime         not null
+#  description :string(255)      default(""), not null
 #
 
 class UserTeam < ActiveRecord::Base
diff --git a/spec/factories/user_teams.rb b/spec/factories/user_teams.rb
index 8d1ee11ee75..3aeea40a6c9 100644
--- a/spec/factories/user_teams.rb
+++ b/spec/factories/user_teams.rb
@@ -2,12 +2,13 @@
 #
 # Table name: user_teams
 #
-#  id         :integer          not null, primary key
-#  name       :string(255)
-#  path       :string(255)
-#  owner_id   :integer
-#  created_at :datetime         not null
-#  updated_at :datetime         not null
+#  id          :integer          not null, primary key
+#  name        :string(255)
+#  path        :string(255)
+#  owner_id    :integer
+#  created_at  :datetime         not null
+#  updated_at  :datetime         not null
+#  description :string(255)      default(""), not null
 #
 
 # Read about factories at https://github.com/thoughtbot/factory_girl
diff --git a/spec/models/group_spec.rb b/spec/models/group_spec.rb
index 108bc303540..5d4674e3a9f 100644
--- a/spec/models/group_spec.rb
+++ b/spec/models/group_spec.rb
@@ -2,13 +2,14 @@
 #
 # Table name: namespaces
 #
-#  id         :integer          not null, primary key
-#  name       :string(255)      not null
-#  path       :string(255)      not null
-#  owner_id   :integer          not null
-#  created_at :datetime         not null
-#  updated_at :datetime         not null
-#  type       :string(255)
+#  id          :integer          not null, primary key
+#  name        :string(255)      not null
+#  path        :string(255)      not null
+#  owner_id    :integer          not null
+#  created_at  :datetime         not null
+#  updated_at  :datetime         not null
+#  type        :string(255)
+#  description :string(255)      default(""), not null
 #
 
 require 'spec_helper'
diff --git a/spec/models/issue_spec.rb b/spec/models/issue_spec.rb
index 99d9f65b0d7..1bc794dcd77 100644
--- a/spec/models/issue_spec.rb
+++ b/spec/models/issue_spec.rb
@@ -9,11 +9,11 @@
 #  project_id   :integer
 #  created_at   :datetime         not null
 #  updated_at   :datetime         not null
-#  state        :string           default(FALSE), not null
 #  position     :integer          default(0)
 #  branch_name  :string(255)
 #  description  :text
 #  milestone_id :integer
+#  state        :string(255)
 #
 
 require 'spec_helper'
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb
index dbae019e7d8..c64c053bad2 100644
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
@@ -9,14 +9,13 @@
 #  author_id     :integer
 #  assignee_id   :integer
 #  title         :string(255)
-#  closed        :boolean          default(FALSE), not null
 #  created_at    :datetime         not null
 #  updated_at    :datetime         not null
 #  st_commits    :text(2147483647)
 #  st_diffs      :text(2147483647)
-#  merged        :boolean          default(FALSE), not null
-#  merge_status  :integer          default(1), not null
 #  milestone_id  :integer
+#  state         :string(255)
+#  merge_status  :string(255)
 #
 
 require 'spec_helper'
diff --git a/spec/models/milestone_spec.rb b/spec/models/milestone_spec.rb
index b473f843146..f74fea01aaa 100644
--- a/spec/models/milestone_spec.rb
+++ b/spec/models/milestone_spec.rb
@@ -7,9 +7,9 @@
 #  project_id  :integer          not null
 #  description :text
 #  due_date    :date
-#  state       :string           default(FALSE), not null
 #  created_at  :datetime         not null
 #  updated_at  :datetime         not null
+#  state       :string(255)
 #
 
 require 'spec_helper'
diff --git a/spec/models/namespace_spec.rb b/spec/models/namespace_spec.rb
index d0de4a7b7fb..412e42aa675 100644
--- a/spec/models/namespace_spec.rb
+++ b/spec/models/namespace_spec.rb
@@ -2,13 +2,14 @@
 #
 # Table name: namespaces
 #
-#  id         :integer          not null, primary key
-#  name       :string(255)      not null
-#  path       :string(255)      not null
-#  owner_id   :integer          not null
-#  created_at :datetime         not null
-#  updated_at :datetime         not null
-#  type       :string(255)
+#  id          :integer          not null, primary key
+#  name        :string(255)      not null
+#  path        :string(255)      not null
+#  owner_id    :integer          not null
+#  created_at  :datetime         not null
+#  updated_at  :datetime         not null
+#  type        :string(255)
+#  description :string(255)      default(""), not null
 #
 
 require 'spec_helper'
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index 545908b214d..9423c7de6ec 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -16,6 +16,8 @@
 #  wiki_enabled           :boolean          default(TRUE), not null
 #  namespace_id           :integer
 #  public                 :boolean          default(FALSE), not null
+#  issues_tracker         :string(255)      default("gitlab"), not null
+#  issues_tracker_id      :string(255)
 #
 
 require 'spec_helper'
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index cb39b6fc63f..7d061bf28b2 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -22,10 +22,8 @@
 #  linkedin               :string(255)      default(""), not null
 #  twitter                :string(255)      default(""), not null
 #  authentication_token   :string(255)
-#  dark_scheme            :boolean          default(FALSE), not null
 #  theme_id               :integer          default(1), not null
 #  bio                    :string(255)
-#  state                  :string(255)      default(FALSE), not null
 #  failed_attempts        :integer          default(0)
 #  locked_at              :datetime
 #  extern_uid             :string(255)
@@ -33,6 +31,8 @@
 #  username               :string(255)
 #  can_create_group       :boolean          default(TRUE), not null
 #  can_create_team        :boolean          default(TRUE), not null
+#  state                  :string(255)
+#  color_scheme_id        :integer          default(1), not null
 #
 
 require 'spec_helper'
diff --git a/spec/models/user_team_spec.rb b/spec/models/user_team_spec.rb
index 76d47f41498..6cc2003e97d 100644
--- a/spec/models/user_team_spec.rb
+++ b/spec/models/user_team_spec.rb
@@ -2,12 +2,13 @@
 #
 # Table name: user_teams
 #
-#  id         :integer          not null, primary key
-#  name       :string(255)
-#  path       :string(255)
-#  owner_id   :integer
-#  created_at :datetime         not null
-#  updated_at :datetime         not null
+#  id          :integer          not null, primary key
+#  name        :string(255)
+#  path        :string(255)
+#  owner_id    :integer
+#  created_at  :datetime         not null
+#  updated_at  :datetime         not null
+#  description :string(255)      default(""), not null
 #
 
 require 'spec_helper'