summaryrefslogtreecommitdiff
path: root/app/models
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-08-21 12:34:02 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-08-21 12:34:02 +0300
commit8dd37afe3489ef46e14b33c66d9b80e913540f62 (patch)
tree1375ec1333b451186ff3661aee54465739ca6c80 /app/models
parentfb492386c5323c4996d05a63ba8d93db6ed07f93 (diff)
downloadgitlab-ce-8dd37afe3489ef46e14b33c66d9b80e913540f62.tar.gz
Reannotate
Diffstat (limited to 'app/models')
-rw-r--r--app/models/deploy_key.rb16
-rw-r--r--app/models/issue.rb5
-rw-r--r--app/models/key.rb16
-rw-r--r--app/models/merge_request.rb31
-rw-r--r--app/models/milestone.rb1
-rw-r--r--app/models/note.rb5
-rw-r--r--app/models/personal_snippet.rb6
-rw-r--r--app/models/project.rb5
-rw-r--r--app/models/project_hook.rb4
-rw-r--r--app/models/project_snippet.rb6
-rw-r--r--app/models/service_hook.rb4
-rw-r--r--app/models/snippet.rb6
-rw-r--r--app/models/system_hook.rb4
-rw-r--r--app/models/user.rb6
-rw-r--r--app/models/users_group.rb13
-rw-r--r--app/models/users_project.rb4
-rw-r--r--app/models/web_hook.rb4
17 files changed, 71 insertions, 65 deletions
diff --git a/app/models/deploy_key.rb b/app/models/deploy_key.rb
index f983198085c..47aeb93a419 100644
--- a/app/models/deploy_key.rb
+++ b/app/models/deploy_key.rb
@@ -2,14 +2,14 @@
#
# Table name: keys
#
-# id :integer not null, primary key
-# user_id :integer
-# created_at :datetime
-# updated_at :datetime
-# key :text
-# title :string(255)
-# identifier :string(255)
-# type :string(255)
+# id :integer not null, primary key
+# user_id :integer
+# created_at :datetime not null
+# updated_at :datetime not null
+# key :text
+# title :string(255)
+# type :string(255)
+# fingerprint :string(255)
#
class DeployKey < Key
diff --git a/app/models/issue.rb b/app/models/issue.rb
index 35b487dc3cf..03c1c166137 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -7,13 +7,14 @@
# assignee_id :integer
# author_id :integer
# project_id :integer
-# created_at :datetime
-# updated_at :datetime
+# created_at :datetime not null
+# updated_at :datetime not null
# position :integer default(0)
# branch_name :string(255)
# description :text
# milestone_id :integer
# state :string(255)
+# iid :integer
#
class Issue < ActiveRecord::Base
diff --git a/app/models/key.rb b/app/models/key.rb
index 902a7c59116..79f7bbd2590 100644
--- a/app/models/key.rb
+++ b/app/models/key.rb
@@ -2,14 +2,14 @@
#
# Table name: keys
#
-# id :integer not null, primary key
-# user_id :integer
-# created_at :datetime
-# updated_at :datetime
-# key :text
-# title :string(255)
-# identifier :string(255)
-# type :string(255)
+# id :integer not null, primary key
+# user_id :integer
+# created_at :datetime not null
+# updated_at :datetime not null
+# key :text
+# title :string(255)
+# type :string(255)
+# fingerprint :string(255)
#
require 'digest/md5'
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 190f6ab15f4..0bb4b231f62 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -2,21 +2,22 @@
#
# Table name: merge_requests
#
-# id :integer not null, primary key
-# target_project_id :integer not null
-# target_branch :string(255) not null
-# source_project_id :integer not null
-# source_branch :string(255) not null
-# author_id :integer
-# assignee_id :integer
-# title :string(255)
-# created_at :datetime
-# updated_at :datetime
-# st_commits :text(2147483647)
-# st_diffs :text(2147483647)
-# milestone_id :integer
-# state :string(255)
-# merge_status :string(255)
+# id :integer not null, primary key
+# target_branch :string(255) not null
+# source_branch :string(255) not null
+# source_project_id :integer not null
+# author_id :integer
+# assignee_id :integer
+# title :string(255)
+# created_at :datetime not null
+# updated_at :datetime not null
+# st_commits :text(2147483647)
+# st_diffs :text(2147483647)
+# milestone_id :integer
+# state :string(255)
+# merge_status :string(255)
+# target_project_id :integer not null
+# iid :integer
#
require Rails.root.join("app/models/commit")
diff --git a/app/models/milestone.rb b/app/models/milestone.rb
index cfa47f30bde..1a73fa71e48 100644
--- a/app/models/milestone.rb
+++ b/app/models/milestone.rb
@@ -10,6 +10,7 @@
# created_at :datetime not null
# updated_at :datetime not null
# state :string(255)
+# iid :integer
#
class Milestone < ActiveRecord::Base
diff --git a/app/models/note.rb b/app/models/note.rb
index c0bf79237c1..7598978ad4d 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -6,13 +6,14 @@
# note :text
# noteable_type :string(255)
# author_id :integer
-# created_at :datetime
-# updated_at :datetime
+# created_at :datetime not null
+# updated_at :datetime not null
# project_id :integer
# attachment :string(255)
# line_code :string(255)
# commit_id :string(255)
# noteable_id :integer
+# st_diff :text
#
require 'carrierwave/orm/activerecord'
diff --git a/app/models/personal_snippet.rb b/app/models/personal_snippet.rb
index a3c0d201ee5..ef2000ad05e 100644
--- a/app/models/personal_snippet.rb
+++ b/app/models/personal_snippet.rb
@@ -4,11 +4,11 @@
#
# id :integer not null, primary key
# title :string(255)
-# content :text
+# content :text(2147483647)
# author_id :integer not null
# project_id :integer
-# created_at :datetime
-# updated_at :datetime
+# created_at :datetime not null
+# updated_at :datetime not null
# file_name :string(255)
# expires_at :datetime
# private :boolean default(TRUE), not null
diff --git a/app/models/project.rb b/app/models/project.rb
index a40cea2ad39..b1b7634233c 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -6,8 +6,8 @@
# name :string(255)
# path :string(255)
# description :text
-# created_at :datetime
-# updated_at :datetime
+# created_at :datetime not null
+# updated_at :datetime not null
# creator_id :integer
# default_branch :string(255)
# issues_enabled :boolean default(TRUE), not null
@@ -21,6 +21,7 @@
# snippets_enabled :boolean default(TRUE), not null
# last_activity_at :datetime
# imported :boolean default(FALSE), not null
+# import_url :string(255)
#
require "grit"
diff --git a/app/models/project_hook.rb b/app/models/project_hook.rb
index b82e1ffd4ab..2576fc979d4 100644
--- a/app/models/project_hook.rb
+++ b/app/models/project_hook.rb
@@ -5,8 +5,8 @@
# id :integer not null, primary key
# url :string(255)
# project_id :integer
-# created_at :datetime
-# updated_at :datetime
+# created_at :datetime not null
+# updated_at :datetime not null
# type :string(255) default("ProjectHook")
# service_id :integer
#
diff --git a/app/models/project_snippet.rb b/app/models/project_snippet.rb
index 14c88046423..f38aa07059c 100644
--- a/app/models/project_snippet.rb
+++ b/app/models/project_snippet.rb
@@ -4,11 +4,11 @@
#
# id :integer not null, primary key
# title :string(255)
-# content :text
+# content :text(2147483647)
# author_id :integer not null
# project_id :integer
-# created_at :datetime
-# updated_at :datetime
+# created_at :datetime not null
+# updated_at :datetime not null
# file_name :string(255)
# expires_at :datetime
# private :boolean default(TRUE), not null
diff --git a/app/models/service_hook.rb b/app/models/service_hook.rb
index 433e8059788..4cd2b272eec 100644
--- a/app/models/service_hook.rb
+++ b/app/models/service_hook.rb
@@ -5,8 +5,8 @@
# id :integer not null, primary key
# url :string(255)
# project_id :integer
-# created_at :datetime
-# updated_at :datetime
+# created_at :datetime not null
+# updated_at :datetime not null
# type :string(255) default("ProjectHook")
# service_id :integer
#
diff --git a/app/models/snippet.rb b/app/models/snippet.rb
index 3a2fc17e59c..edc179b20fd 100644
--- a/app/models/snippet.rb
+++ b/app/models/snippet.rb
@@ -4,11 +4,11 @@
#
# id :integer not null, primary key
# title :string(255)
-# content :text
+# content :text(2147483647)
# author_id :integer not null
# project_id :integer
-# created_at :datetime
-# updated_at :datetime
+# created_at :datetime not null
+# updated_at :datetime not null
# file_name :string(255)
# expires_at :datetime
# private :boolean default(TRUE), not null
diff --git a/app/models/system_hook.rb b/app/models/system_hook.rb
index 2d28f4cd452..5cdf046644f 100644
--- a/app/models/system_hook.rb
+++ b/app/models/system_hook.rb
@@ -5,8 +5,8 @@
# id :integer not null, primary key
# url :string(255)
# project_id :integer
-# created_at :datetime
-# updated_at :datetime
+# created_at :datetime not null
+# updated_at :datetime not null
# type :string(255) default("ProjectHook")
# service_id :integer
#
diff --git a/app/models/user.rb b/app/models/user.rb
index a0637b522d0..071f6f30f5a 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -4,7 +4,7 @@
#
# id :integer not null, primary key
# email :string(255) default(""), not null
-# encrypted_password :string(128) default(""), not null
+# encrypted_password :string(255) default(""), not null
# reset_password_token :string(255)
# reset_password_sent_at :datetime
# remember_created_at :datetime
@@ -13,8 +13,8 @@
# last_sign_in_at :datetime
# current_sign_in_ip :string(255)
# last_sign_in_ip :string(255)
-# created_at :datetime
-# updated_at :datetime
+# created_at :datetime not null
+# updated_at :datetime not null
# name :string(255)
# admin :boolean default(FALSE), not null
# projects_limit :integer default(10)
diff --git a/app/models/users_group.rb b/app/models/users_group.rb
index 3686551830d..181bf322283 100644
--- a/app/models/users_group.rb
+++ b/app/models/users_group.rb
@@ -2,12 +2,13 @@
#
# Table name: users_groups
#
-# id :integer not null, primary key
-# group_access :integer not null
-# group_id :integer not null
-# user_id :integer not null
-# created_at :datetime not null
-# updated_at :datetime not null
+# id :integer not null, primary key
+# group_access :integer not null
+# group_id :integer not null
+# user_id :integer not null
+# created_at :datetime not null
+# updated_at :datetime not null
+# notification_level :integer default(3), not null
#
class UsersGroup < ActiveRecord::Base
diff --git a/app/models/users_project.rb b/app/models/users_project.rb
index 76f5685e047..c435df2b442 100644
--- a/app/models/users_project.rb
+++ b/app/models/users_project.rb
@@ -5,8 +5,8 @@
# id :integer not null, primary key
# user_id :integer not null
# project_id :integer not null
-# created_at :datetime
-# updated_at :datetime
+# created_at :datetime not null
+# updated_at :datetime not null
# project_access :integer default(0), not null
# notification_level :integer default(3), not null
#
diff --git a/app/models/web_hook.rb b/app/models/web_hook.rb
index 1e6ea885ea9..3f22b1082fb 100644
--- a/app/models/web_hook.rb
+++ b/app/models/web_hook.rb
@@ -5,8 +5,8 @@
# id :integer not null, primary key
# url :string(255)
# project_id :integer
-# created_at :datetime
-# updated_at :datetime
+# created_at :datetime not null
+# updated_at :datetime not null
# type :string(255) default("ProjectHook")
# service_id :integer
#