Download as
Browse Code »

Commit 21b1fee92c9d860281712ed97cf724e6d5d3fe76

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

reannotated

Showing 17 changed files with 56 additions and 49 deletions   Show diff stats
app/models/group.rb
  Diff comments   View file @21b1fee
@@ -4,12 +4,12 @@ @@ -4,12 +4,12 @@
4 # 4 #
5 # id :integer not null, primary key 5 # id :integer not null, primary key
6 # name :string(255) not null 6 # name :string(255) not null
7 -# description :string(255) not null  
8 # path :string(255) not null 7 # path :string(255) not null
9 # owner_id :integer not null 8 # owner_id :integer not null
10 # created_at :datetime not null 9 # created_at :datetime not null
11 # updated_at :datetime not null 10 # updated_at :datetime not null
12 # type :string(255) 11 # type :string(255)
  12 +# description :string(255) default(""), not null
13 # 13 #
14 14
15 class Group < Namespace 15 class Group < Namespace
app/models/issue.rb
  Diff comments   View file @21b1fee
@@ -9,11 +9,11 @@ @@ -9,11 +9,11 @@
9 # project_id :integer 9 # project_id :integer
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 default(FALSE), not null  
13 # position :integer default(0) 12 # position :integer default(0)
14 # branch_name :string(255) 13 # branch_name :string(255)
15 # description :text 14 # description :text
16 # milestone_id :integer 15 # milestone_id :integer
  16 +# state :string(255)
17 # 17 #
18 18
19 class Issue < ActiveRecord::Base 19 class Issue < ActiveRecord::Base
app/models/merge_request.rb
  Diff comments   View file @21b1fee
@@ -9,14 +9,14 @@ @@ -9,14 +9,14 @@
9 # author_id :integer 9 # author_id :integer
10 # assignee_id :integer 10 # assignee_id :integer
11 # title :string(255) 11 # title :string(255)
12 -# state :string(255) not null  
13 # created_at :datetime not null 12 # created_at :datetime not null
14 # updated_at :datetime not null 13 # updated_at :datetime not null
15 # st_commits :text(2147483647) 14 # st_commits :text(2147483647)
16 # st_diffs :text(2147483647) 15 # st_diffs :text(2147483647)
17 -# merge_status :integer default(1), not null  
18 -#  
19 # milestone_id :integer 16 # milestone_id :integer
  17 +# state :string(255)
  18 +# merge_status :string(255)
  19 +#
20 20
21 require Rails.root.join("app/models/commit") 21 require Rails.root.join("app/models/commit")
22 require Rails.root.join("lib/static_model") 22 require Rails.root.join("lib/static_model")
app/models/milestone.rb
  Diff comments   View file @21b1fee
@@ -7,9 +7,9 @@ @@ -7,9 +7,9 @@
7 # project_id :integer not null 7 # project_id :integer not null
8 # description :text 8 # description :text
9 # due_date :date 9 # due_date :date
10 -# closed :boolean default(FALSE), not null  
11 # created_at :datetime not null 10 # created_at :datetime not null
12 # updated_at :datetime not null 11 # updated_at :datetime not null
  12 +# state :string(255)
13 # 13 #
14 14
15 class Milestone < ActiveRecord::Base 15 class Milestone < ActiveRecord::Base
app/models/namespace.rb
  Diff comments   View file @21b1fee
@@ -4,12 +4,12 @@ @@ -4,12 +4,12 @@
4 # 4 #
5 # id :integer not null, primary key 5 # id :integer not null, primary key
6 # name :string(255) not null 6 # name :string(255) not null
7 -# description :string(255) not null  
8 # path :string(255) not null 7 # path :string(255) not null
9 # owner_id :integer not null 8 # owner_id :integer not null
10 # created_at :datetime not null 9 # created_at :datetime not null
11 # updated_at :datetime not null 10 # updated_at :datetime not null
12 # type :string(255) 11 # type :string(255)
  12 +# description :string(255) default(""), not null
13 # 13 #
14 14
15 class Namespace < ActiveRecord::Base 15 class Namespace < ActiveRecord::Base
app/models/project.rb
  Diff comments   View file @21b1fee
@@ -11,12 +11,13 @@ @@ -11,12 +11,13 @@
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
14 -# issues_tracker :string not null  
15 # wall_enabled :boolean default(TRUE), not null 14 # wall_enabled :boolean default(TRUE), not null
16 # merge_requests_enabled :boolean default(TRUE), not null 15 # merge_requests_enabled :boolean default(TRUE), not null
17 # wiki_enabled :boolean default(TRUE), not null 16 # wiki_enabled :boolean default(TRUE), not null
18 # namespace_id :integer 17 # namespace_id :integer
19 # public :boolean default(FALSE), not null 18 # public :boolean default(FALSE), not null
  19 +# issues_tracker :string(255) default("gitlab"), not null
  20 +# issues_tracker_id :string(255)
20 # 21 #
21 22
22 require "grit" 23 require "grit"
app/models/user.rb
  Diff comments   View file @21b1fee
@@ -22,10 +22,8 @@ @@ -22,10 +22,8 @@
22 # linkedin :string(255) default(""), not null 22 # linkedin :string(255) default(""), not null
23 # twitter :string(255) default(""), not null 23 # twitter :string(255) default(""), not null
24 # authentication_token :string(255) 24 # authentication_token :string(255)
25 -# dark_scheme :boolean default(FALSE), not null  
26 # theme_id :integer default(1), not null 25 # theme_id :integer default(1), not null
27 # bio :string(255) 26 # bio :string(255)
28 -# state :string(255)  
29 # failed_attempts :integer default(0) 27 # failed_attempts :integer default(0)
30 # locked_at :datetime 28 # locked_at :datetime
31 # extern_uid :string(255) 29 # extern_uid :string(255)
@@ -33,6 +31,8 @@ @@ -33,6 +31,8 @@
33 # username :string(255) 31 # username :string(255)
34 # can_create_group :boolean default(TRUE), not null 32 # can_create_group :boolean default(TRUE), not null
35 # can_create_team :boolean default(TRUE), not null 33 # can_create_team :boolean default(TRUE), not null
  34 +# state :string(255)
  35 +# color_scheme_id :integer default(1), not null
36 # 36 #
37 37
38 class User < ActiveRecord::Base 38 class User < ActiveRecord::Base
app/models/user_team.rb
  Diff comments   View file @21b1fee
@@ -2,12 +2,13 @@ @@ -2,12 +2,13 @@
2 # 2 #
3 # Table name: user_teams 3 # Table name: user_teams
4 # 4 #
5 -# id :integer not null, primary key  
6 -# name :string(255)  
7 -# path :string(255)  
8 -# owner_id :integer  
9 -# created_at :datetime not null  
10 -# updated_at :datetime not null 5 +# id :integer not null, primary key
  6 +# name :string(255)
  7 +# path :string(255)
  8 +# owner_id :integer
  9 +# created_at :datetime not null
  10 +# updated_at :datetime not null
  11 +# description :string(255) default(""), not null
11 # 12 #
12 13
13 class UserTeam < ActiveRecord::Base 14 class UserTeam < ActiveRecord::Base
spec/factories/user_teams.rb
  Diff comments   View file @21b1fee
@@ -2,12 +2,13 @@ @@ -2,12 +2,13 @@
2 # 2 #
3 # Table name: user_teams 3 # Table name: user_teams
4 # 4 #
5 -# id :integer not null, primary key  
6 -# name :string(255)  
7 -# path :string(255)  
8 -# owner_id :integer  
9 -# created_at :datetime not null  
10 -# updated_at :datetime not null 5 +# id :integer not null, primary key
  6 +# name :string(255)
  7 +# path :string(255)
  8 +# owner_id :integer
  9 +# created_at :datetime not null
  10 +# updated_at :datetime not null
  11 +# description :string(255) default(""), not null
11 # 12 #
12 13
13 # Read about factories at https://github.com/thoughtbot/factory_girl 14 # Read about factories at https://github.com/thoughtbot/factory_girl
spec/models/group_spec.rb
  Diff comments   View file @21b1fee
@@ -2,13 +2,14 @@ @@ -2,13 +2,14 @@
2 # 2 #
3 # Table name: namespaces 3 # Table name: namespaces
4 # 4 #
5 -# id :integer not null, primary key  
6 -# name :string(255) not null  
7 -# path :string(255) not null  
8 -# owner_id :integer not null  
9 -# created_at :datetime not null  
10 -# updated_at :datetime not null  
11 -# type :string(255) 5 +# id :integer not null, primary key
  6 +# name :string(255) not null
  7 +# path :string(255) not null
  8 +# owner_id :integer not null
  9 +# created_at :datetime not null
  10 +# updated_at :datetime not null
  11 +# type :string(255)
  12 +# description :string(255) default(""), not null
12 # 13 #
13 14
14 require 'spec_helper' 15 require 'spec_helper'
spec/models/issue_spec.rb
  Diff comments   View file @21b1fee
@@ -9,11 +9,11 @@ @@ -9,11 +9,11 @@
9 # project_id :integer 9 # project_id :integer
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 default(FALSE), not null  
13 # position :integer default(0) 12 # position :integer default(0)
14 # branch_name :string(255) 13 # branch_name :string(255)
15 # description :text 14 # description :text
16 # milestone_id :integer 15 # milestone_id :integer
  16 +# state :string(255)
17 # 17 #
18 18
19 require 'spec_helper' 19 require 'spec_helper'
spec/models/merge_request_spec.rb
  Diff comments   View file @21b1fee
@@ -9,14 +9,13 @@ @@ -9,14 +9,13 @@
9 # author_id :integer 9 # author_id :integer
10 # assignee_id :integer 10 # assignee_id :integer
11 # title :string(255) 11 # title :string(255)
12 -# closed :boolean default(FALSE), not null  
13 # created_at :datetime not null 12 # created_at :datetime not null
14 # updated_at :datetime not null 13 # updated_at :datetime not null
15 # st_commits :text(2147483647) 14 # st_commits :text(2147483647)
16 # st_diffs :text(2147483647) 15 # st_diffs :text(2147483647)
17 -# merged :boolean default(FALSE), not null  
18 -# merge_status :integer default(1), not null  
19 # milestone_id :integer 16 # milestone_id :integer
  17 +# state :string(255)
  18 +# merge_status :string(255)
20 # 19 #
21 20
22 require 'spec_helper' 21 require 'spec_helper'
spec/models/milestone_spec.rb
  Diff comments   View file @21b1fee
@@ -7,9 +7,9 @@ @@ -7,9 +7,9 @@
7 # project_id :integer not null 7 # project_id :integer not null
8 # description :text 8 # description :text
9 # due_date :date 9 # due_date :date
10 -# state :string default(FALSE), not null  
11 # created_at :datetime not null 10 # created_at :datetime not null
12 # updated_at :datetime not null 11 # updated_at :datetime not null
  12 +# state :string(255)
13 # 13 #
14 14
15 require 'spec_helper' 15 require 'spec_helper'
spec/models/namespace_spec.rb
  Diff comments   View file @21b1fee
@@ -2,13 +2,14 @@ @@ -2,13 +2,14 @@
2 # 2 #
3 # Table name: namespaces 3 # Table name: namespaces
4 # 4 #
5 -# id :integer not null, primary key  
6 -# name :string(255) not null  
7 -# path :string(255) not null  
8 -# owner_id :integer not null  
9 -# created_at :datetime not null  
10 -# updated_at :datetime not null  
11 -# type :string(255) 5 +# id :integer not null, primary key
  6 +# name :string(255) not null
  7 +# path :string(255) not null
  8 +# owner_id :integer not null
  9 +# created_at :datetime not null
  10 +# updated_at :datetime not null
  11 +# type :string(255)
  12 +# description :string(255) default(""), not null
12 # 13 #
13 14
14 require 'spec_helper' 15 require 'spec_helper'
spec/models/project_spec.rb
  Diff comments   View file @21b1fee
@@ -16,6 +16,8 @@ @@ -16,6 +16,8 @@
16 # wiki_enabled :boolean default(TRUE), not null 16 # wiki_enabled :boolean default(TRUE), not null
17 # namespace_id :integer 17 # namespace_id :integer
18 # public :boolean default(FALSE), not null 18 # public :boolean default(FALSE), not null
  19 +# issues_tracker :string(255) default("gitlab"), not null
  20 +# issues_tracker_id :string(255)
19 # 21 #
20 22
21 require 'spec_helper' 23 require 'spec_helper'
spec/models/user_spec.rb
  Diff comments   View file @21b1fee
@@ -22,10 +22,8 @@ @@ -22,10 +22,8 @@
22 # linkedin :string(255) default(""), not null 22 # linkedin :string(255) default(""), not null
23 # twitter :string(255) default(""), not null 23 # twitter :string(255) default(""), not null
24 # authentication_token :string(255) 24 # authentication_token :string(255)
25 -# dark_scheme :boolean default(FALSE), not null  
26 # theme_id :integer default(1), not null 25 # theme_id :integer default(1), not null
27 # bio :string(255) 26 # bio :string(255)
28 -# state :string(255) default(FALSE), not null  
29 # failed_attempts :integer default(0) 27 # failed_attempts :integer default(0)
30 # locked_at :datetime 28 # locked_at :datetime
31 # extern_uid :string(255) 29 # extern_uid :string(255)
@@ -33,6 +31,8 @@ @@ -33,6 +31,8 @@
33 # username :string(255) 31 # username :string(255)
34 # can_create_group :boolean default(TRUE), not null 32 # can_create_group :boolean default(TRUE), not null
35 # can_create_team :boolean default(TRUE), not null 33 # can_create_team :boolean default(TRUE), not null
  34 +# state :string(255)
  35 +# color_scheme_id :integer default(1), not null
36 # 36 #
37 37
38 require 'spec_helper' 38 require 'spec_helper'
spec/models/user_team_spec.rb
  Diff comments   View file @21b1fee
@@ -2,12 +2,13 @@ @@ -2,12 +2,13 @@
2 # 2 #
3 # Table name: user_teams 3 # Table name: user_teams
4 # 4 #
5 -# id :integer not null, primary key  
6 -# name :string(255)  
7 -# path :string(255)  
8 -# owner_id :integer  
9 -# created_at :datetime not null  
10 -# updated_at :datetime not null 5 +# id :integer not null, primary key
  6 +# name :string(255)
  7 +# path :string(255)
  8 +# owner_id :integer
  9 +# created_at :datetime not null
  10 +# updated_at :datetime not null
  11 +# description :string(255) default(""), not null
11 # 12 #
12 13
13 require 'spec_helper' 14 require 'spec_helper'