Reannotate

Dmitriy Zaporozhets
1 parent fb492386
Showing 33 changed files with 144 additions and 130 deletions Show diff stats
app/models/deploy_key.rb
app/models/issue.rb
app/models/key.rb
app/models/merge_request.rb
app/models/milestone.rb
app/models/note.rb
app/models/personal_snippet.rb
app/models/project.rb
app/models/project_hook.rb
app/models/project_snippet.rb
app/models/service_hook.rb
app/models/snippet.rb
app/models/system_hook.rb
app/models/user.rb
app/models/users_group.rb
app/models/users_project.rb
app/models/web_hook.rb
spec/factories/users_groups.rb
spec/models/deploy_key_spec.rb
spec/models/issue_spec.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
@@ -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
@@ -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'
@@ -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")
@@ -10,6 +10,7 @@
 #  created_at  :datetime         not null
 #  updated_at  :datetime         not null
 #  state       :string(255)
+#  iid         :integer
 #
  
 class Milestone < ActiveRecord::Base
@@ -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'
@@ -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
@@ -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"
@@ -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
 #
@@ -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
@@ -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
 #
@@ -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
@@ -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
 #
@@ -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)
@@ -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
@@ -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
 #
@@ -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
 #
@@ -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
 #
  
 FactoryGirl.define do
@@ -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 'spec_helper'
@@ -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
 #
  
 require 'spec_helper'
@@ -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 'spec_helper'
@@ -2,20 +2,22 @@
 #
 # Table name: merge_requests
 #
-#  id            :integer          not null, primary key
-#  target_branch :string(255)      not null
-#  source_branch :string(255)      not null
-#  project_id    :integer          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 'spec_helper'
@@ -10,6 +10,7 @@
 #  created_at  :datetime         not null
 #  updated_at  :datetime         not null
 #  state       :string(255)
+#  iid         :integer
 #
  
 require 'spec_helper'
@@ -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 'spec_helper'
@@ -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
@@ -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 'spec_helper'
@@ -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
 #
@@ -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
@@ -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
 #
@@ -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)
@@ -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
 #
  
 require 'spec_helper'
@@ -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
 #
@@ -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
 #
...	...	@@ -2,14 +2,14 @@
2	2	#
3	3	# Table name: keys
4	4	#
5		-# id :integer not null, primary key
6		-# user_id :integer
7		-# created_at :datetime
8		-# updated_at :datetime
9		-# key :text
10		-# title :string(255)
11		-# identifier :string(255)
12		-# type :string(255)
	5	+# id :integer not null, primary key
	6	+# user_id :integer
	7	+# created_at :datetime not null
	8	+# updated_at :datetime not null
	9	+# key :text
	10	+# title :string(255)
	11	+# type :string(255)
	12	+# fingerprint :string(255)
13	13	#
14	14
15	15	class DeployKey < Key
...	...
...	...	@@ -7,13 +7,14 @@
7	7	# assignee_id :integer
8	8	# author_id :integer
9	9	# project_id :integer
10		-# created_at :datetime
11		-# updated_at :datetime
	10	+# created_at :datetime not null
	11	+# updated_at :datetime not null
12	12	# position :integer default(0)
13	13	# branch_name :string(255)
14	14	# description :text
15	15	# milestone_id :integer
16	16	# state :string(255)
	17	+# iid :integer
17	18	#
18	19
19	20	class Issue < ActiveRecord::Base
...	...
...	...	@@ -2,21 +2,22 @@
2	2	#
3	3	# Table name: merge_requests
4	4	#
5		-# id :integer not null, primary key
6		-# target_project_id :integer not null
7		-# target_branch :string(255) not null
8		-# source_project_id :integer not null
9		-# source_branch :string(255) not null
10		-# author_id :integer
11		-# assignee_id :integer
12		-# title :string(255)
13		-# created_at :datetime
14		-# updated_at :datetime
15		-# st_commits :text(2147483647)
16		-# st_diffs :text(2147483647)
17		-# milestone_id :integer
18		-# state :string(255)
19		-# merge_status :string(255)
	5	+# id :integer not null, primary key
	6	+# target_branch :string(255) not null
	7	+# source_branch :string(255) not null
	8	+# source_project_id :integer not null
	9	+# author_id :integer
	10	+# assignee_id :integer
	11	+# title :string(255)
	12	+# created_at :datetime not null
	13	+# updated_at :datetime not null
	14	+# st_commits :text(2147483647)
	15	+# st_diffs :text(2147483647)
	16	+# milestone_id :integer
	17	+# state :string(255)
	18	+# merge_status :string(255)
	19	+# target_project_id :integer not null
	20	+# iid :integer
20	21	#
21	22
22	23	require Rails.root.join("app/models/commit")
...	...
...	...	@@ -10,6 +10,7 @@
10	10	# created_at :datetime not null
11	11	# updated_at :datetime not null
12	12	# state :string(255)
	13	+# iid :integer
13	14	#
14	15
15	16	class Milestone < ActiveRecord::Base
...	...
...	...	@@ -6,13 +6,14 @@
6	6	# note :text
7	7	# noteable_type :string(255)
8	8	# author_id :integer
9		-# created_at :datetime
10		-# updated_at :datetime
	9	+# created_at :datetime not null
	10	+# updated_at :datetime not null
11	11	# project_id :integer
12	12	# attachment :string(255)
13	13	# line_code :string(255)
14	14	# commit_id :string(255)
15	15	# noteable_id :integer
	16	+# st_diff :text
16	17	#
17	18
18	19	require 'carrierwave/orm/activerecord'
...	...
...	...	@@ -4,11 +4,11 @@
4	4	#
5	5	# id :integer not null, primary key
6	6	# title :string(255)
7		-# content :text
	7	+# content :text(2147483647)
8	8	# author_id :integer not null
9	9	# project_id :integer
10		-# created_at :datetime
11		-# updated_at :datetime
	10	+# created_at :datetime not null
	11	+# updated_at :datetime not null
12	12	# file_name :string(255)
13	13	# expires_at :datetime
14	14	# private :boolean default(TRUE), not null
...	...
...	...	@@ -6,8 +6,8 @@
6	6	# name :string(255)
7	7	# path :string(255)
8	8	# description :text
9		-# created_at :datetime
10		-# updated_at :datetime
	9	+# created_at :datetime not null
	10	+# updated_at :datetime not null
11	11	# creator_id :integer
12	12	# default_branch :string(255)
13	13	# issues_enabled :boolean default(TRUE), not null
...	...	@@ -21,6 +21,7 @@
21	21	# snippets_enabled :boolean default(TRUE), not null
22	22	# last_activity_at :datetime
23	23	# imported :boolean default(FALSE), not null
	24	+# import_url :string(255)
24	25	#
25	26
26	27	require "grit"
...	...
...	...	@@ -5,8 +5,8 @@
5	5	# id :integer not null, primary key
6	6	# url :string(255)
7	7	# project_id :integer
8		-# created_at :datetime
9		-# updated_at :datetime
	8	+# created_at :datetime not null
	9	+# updated_at :datetime not null
10	10	# type :string(255) default("ProjectHook")
11	11	# service_id :integer
12	12	#
...	...
...	...	@@ -4,7 +4,7 @@
4	4	#
5	5	# id :integer not null, primary key
6	6	# email :string(255) default(""), not null
7		-# encrypted_password :string(128) default(""), not null
	7	+# encrypted_password :string(255) default(""), not null
8	8	# reset_password_token :string(255)
9	9	# reset_password_sent_at :datetime
10	10	# remember_created_at :datetime
...	...	@@ -13,8 +13,8 @@
13	13	# last_sign_in_at :datetime
14	14	# current_sign_in_ip :string(255)
15	15	# last_sign_in_ip :string(255)
16		-# created_at :datetime
17		-# updated_at :datetime
	16	+# created_at :datetime not null
	17	+# updated_at :datetime not null
18	18	# name :string(255)
19	19	# admin :boolean default(FALSE), not null
20	20	# projects_limit :integer default(10)
...	...
...	...	@@ -2,12 +2,13 @@
2	2	#
3	3	# Table name: users_groups
4	4	#
5		-# id :integer not null, primary key
6		-# group_access :integer not null
7		-# group_id :integer not null
8		-# user_id :integer not null
9		-# created_at :datetime not null
10		-# updated_at :datetime not null
	5	+# id :integer not null, primary key
	6	+# group_access :integer not null
	7	+# group_id :integer not null
	8	+# user_id :integer not null
	9	+# created_at :datetime not null
	10	+# updated_at :datetime not null
	11	+# notification_level :integer default(3), not null
11	12	#
12	13
13	14	class UsersGroup < ActiveRecord::Base
...	...