Download as
Browse Code »

Commit 8dd37afe3489ef46e14b33c66d9b80e913540f62

Authored by Dmitriy Zaporozhets
1 parent fb492386
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Reannotate

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