diff --git a/app/models/group.rb b/app/models/group.rb index 7651ce23cb650659aa8b6dbad0cdf63925379557..5d838d2b9b024c72792d0cfa3e29ca6a72f9a406 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 f01cad0a458eb82cf897307ac632d769cc9e0f9f..54d9af7e67e4d2ad2a26bbcf4d6a20573b25483f 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 354a95e9a93a1c62f506e745194ca97d8951adc9..9d42b1e1f32c7d9f207ab03c27cbc13077bd5005 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 d822a68dc7a3cee30fcab7b6fc51014a7197f1d8..2a9b9e4482c7796a01dc27f01bb352a90208555a 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 c6b3e94d05dffdb63b77688769a68671fc858b8f..e8b7d0c3706e356051c11c0980172decb96c0340 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 07ba7fc369eb3e0ef57271b0f9c3cdc93d258137..458ef18376c25c6eb6f1f5a1041e9d004d708805 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 2b6eebf254f46e731c2e48dadd9d22ada48d9579..c73353bf032dd0eaec81b64cdb6d93e6459ddab8 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 d5b758512792598e6809c01bad1c2b9631ad274b..5de2ac6ae9e96620b22ebc2bb2d781bd12799b25 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 8d1ee11ee752e0caf096afce8b8fda99964fda29..3aeea40a6c951358361fa1507e4e7ac863a07ea9 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 108bc303540b905119049dcdf97f2a5b14b7a609..5d4674e3a9f1c7cb35466f7ac913e9e33142fc62 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 99d9f65b0d7c5f00a4ef6140da1acd4d730bc150..1bc794dcd77cf19ca2fdcd19c4cc499f5f877c88 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 dbae019e7d8895c3c561f8592aba35f0d04b61b6..c64c053bad2af0ce164ef754c90061e190038eb5 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 b473f8431465ac28677490121561346e91e60ced..f74fea01aaa026b355aeaec04b02d3de7babce0d 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 d0de4a7b7fb0eafa6a57c39f870f767530f0deff..412e42aa675939b0f7cf83995cfa44d843ef96e3 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 545908b214d4c1d00a6b79b1b6a5c9acbbea8ac4..9423c7de6ecf4029e30944c562d4e0fb968b2470 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 cb39b6fc63f56cda93ba69a9e48f8844ead9ab80..7d061bf28b21906fd6e9403de68f474f55461117 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 76d47f41498ca53f2be784b3ac9d7d8c7e52c9c3..6cc2003e97dec70ce501a27adc66c445642ec201 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'