Download as
Browse Code »

Commit 6abc649590cfb110a88e6b2bdd3755c7d8ab6b4e

Authored by randx
1 parent 283bf806
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Reannotated

Showing 26 changed files with 190 additions and 142 deletions   Show diff stats
app/models/event.rb
  Diff comments   View file @6abc649
... ... @@ -110,14 +110,15 @@ end
110 110 #
111 111 # Table name: events
112 112 #
113   -# id :integer not null, primary key
  113 +# id :integer(4) not null, primary key
114 114 # target_type :string(255)
115   -# target_id :integer
  115 +# target_id :integer(4)
116 116 # title :string(255)
117 117 # data :text
118   -# project_id :integer
  118 +# project_id :integer(4)
119 119 # created_at :datetime not null
120 120 # updated_at :datetime not null
121   -# action :integer
  121 +# action :integer(4)
  122 +# author_id :integer(4)
122 123 #
123 124  
... ...
app/models/issue.rb
  Diff comments   View file @6abc649
... ... @@ -72,17 +72,18 @@ end
72 72 #
73 73 # Table name: issues
74 74 #
75   -# id :integer not null, primary key
76   -# title :string(255)
77   -# description :text
78   -# assignee_id :integer
79   -# author_id :integer
80   -# project_id :integer
81   -# created_at :datetime
82   -# updated_at :datetime
83   -# closed :boolean default(FALSE), not null
84   -# position :integer default(0)
85   -# critical :boolean default(FALSE), not null
86   -# branch_name :string(255)
  75 +# id :integer(4) not null, primary key
  76 +# title :string(255)
  77 +# assignee_id :integer(4)
  78 +# author_id :integer(4)
  79 +# project_id :integer(4)
  80 +# created_at :datetime not null
  81 +# updated_at :datetime not null
  82 +# closed :boolean(1) default(FALSE), not null
  83 +# position :integer(4) default(0)
  84 +# critical :boolean(1) default(FALSE), not null
  85 +# branch_name :string(255)
  86 +# description :text
  87 +# milestone_id :integer(4)
87 88 #
88 89  
... ...
app/models/key.rb
  Diff comments   View file @6abc649
... ... @@ -55,13 +55,13 @@ end
55 55 #
56 56 # Table name: keys
57 57 #
58   -# id :integer not null, primary key
59   -# user_id :integer
60   -# created_at :datetime
61   -# updated_at :datetime
  58 +# id :integer(4) not null, primary key
  59 +# user_id :integer(4)
  60 +# created_at :datetime not null
  61 +# updated_at :datetime not null
62 62 # key :text
63 63 # title :string(255)
64 64 # identifier :string(255)
65   -# project_id :integer
  65 +# project_id :integer(4)
66 66 #
67 67  
... ...
app/models/merge_request.rb
  Diff comments   View file @6abc649
... ... @@ -198,15 +198,19 @@ end
198 198 #
199 199 # Table name: merge_requests
200 200 #
201   -# id :integer not null, primary key
  201 +# id :integer(4) not null, primary key
202 202 # target_branch :string(255) not null
203 203 # source_branch :string(255) not null
204   -# project_id :integer not null
205   -# author_id :integer
206   -# assignee_id :integer
  204 +# project_id :integer(4) not null
  205 +# author_id :integer(4)
  206 +# assignee_id :integer(4)
207 207 # title :string(255)
208   -# closed :boolean default(FALSE), not null
209   -# created_at :datetime
210   -# updated_at :datetime
  208 +# closed :boolean(1) default(FALSE), not null
  209 +# created_at :datetime not null
  210 +# updated_at :datetime not null
  211 +# st_commits :text(2147483647
  212 +# st_diffs :text(2147483647
  213 +# merged :boolean(1) default(FALSE), not null
  214 +# state :integer(4) default(1), not null
211 215 #
212 216  
... ...
app/models/milestone.rb
  Diff comments   View file @6abc649
  1 +# == Schema Information
  2 +#
  3 +# Table name: milestones
  4 +#
  5 +# id :integer(4) not null, primary key
  6 +# title :string(255) not null
  7 +# project_id :integer(4) not null
  8 +# description :text
  9 +# due_date :date
  10 +# closed :boolean(1) default(FALSE), not null
  11 +# created_at :datetime not null
  12 +# updated_at :datetime not null
  13 +#
  14 +
1 15 class Milestone < ActiveRecord::Base
2 16 belongs_to :project
3 17 has_many :issues
... ...
app/models/note.rb
  Diff comments   View file @6abc649
... ... @@ -110,14 +110,14 @@ end
110 110 #
111 111 # Table name: notes
112 112 #
113   -# id :integer not null, primary key
  113 +# id :integer(4) not null, primary key
114 114 # note :text
115 115 # noteable_id :string(255)
116 116 # noteable_type :string(255)
117   -# author_id :integer
118   -# created_at :datetime
119   -# updated_at :datetime
120   -# project_id :integer
  117 +# author_id :integer(4)
  118 +# created_at :datetime not null
  119 +# updated_at :datetime not null
  120 +# project_id :integer(4)
121 121 # attachment :string(255)
122 122 # line_code :string(255)
123 123 #
... ...
app/models/project.rb
  Diff comments   View file @6abc649
... ... @@ -161,19 +161,19 @@ end
161 161 #
162 162 # Table name: projects
163 163 #
164   -# id :integer not null, primary key
  164 +# id :integer(4) not null, primary key
165 165 # name :string(255)
166 166 # path :string(255)
167 167 # description :text
168   -# created_at :datetime
169   -# updated_at :datetime
170   -# private_flag :boolean default(TRUE), not null
  168 +# created_at :datetime not null
  169 +# updated_at :datetime not null
  170 +# private_flag :boolean(1) default(TRUE), not null
171 171 # code :string(255)
172   -# owner_id :integer
  172 +# owner_id :integer(4)
173 173 # default_branch :string(255) default("master"), not null
174   -# issues_enabled :boolean default(TRUE), not null
175   -# wall_enabled :boolean default(TRUE), not null
176   -# merge_requests_enabled :boolean default(TRUE), not null
177   -# wiki_enabled :boolean default(TRUE), not null
  174 +# issues_enabled :boolean(1) default(TRUE), not null
  175 +# wall_enabled :boolean(1) default(TRUE), not null
  176 +# merge_requests_enabled :boolean(1) default(TRUE), not null
  177 +# wiki_enabled :boolean(1) default(TRUE), not null
178 178 #
179 179  
... ...
app/models/protected_branch.rb
  Diff comments   View file @6abc649
... ... @@ -18,8 +18,8 @@ end
18 18 #
19 19 # Table name: protected_branches
20 20 #
21   -# id :integer not null, primary key
22   -# project_id :integer not null
  21 +# id :integer(4) not null, primary key
  22 +# project_id :integer(4) not null
23 23 # name :string(255) not null
24 24 # created_at :datetime not null
25 25 # updated_at :datetime not null
... ...
app/models/snippet.rb
  Diff comments   View file @6abc649
... ... @@ -62,13 +62,13 @@ end
62 62 #
63 63 # Table name: snippets
64 64 #
65   -# id :integer not null, primary key
  65 +# id :integer(4) not null, primary key
66 66 # title :string(255)
67 67 # content :text
68   -# author_id :integer not null
69   -# project_id :integer not null
70   -# created_at :datetime
71   -# updated_at :datetime
  68 +# author_id :integer(4) not null
  69 +# project_id :integer(4) not null
  70 +# created_at :datetime not null
  71 +# updated_at :datetime not null
72 72 # file_name :string(255)
73 73 # expires_at :datetime
74 74 #
... ...
app/models/user.rb
  Diff comments   View file @6abc649
... ... @@ -92,25 +92,29 @@ end
92 92 #
93 93 # Table name: users
94 94 #
95   -# id :integer not null, primary key
  95 +# id :integer(4) not null, primary key
96 96 # email :string(255) default(""), not null
97 97 # encrypted_password :string(128) default(""), not null
98 98 # reset_password_token :string(255)
99 99 # reset_password_sent_at :datetime
100 100 # remember_created_at :datetime
101   -# sign_in_count :integer default(0)
  101 +# sign_in_count :integer(4) default(0)
102 102 # current_sign_in_at :datetime
103 103 # last_sign_in_at :datetime
104 104 # current_sign_in_ip :string(255)
105 105 # last_sign_in_ip :string(255)
106   -# created_at :datetime
107   -# updated_at :datetime
  106 +# created_at :datetime not null
  107 +# updated_at :datetime not null
108 108 # name :string(255)
109   -# admin :boolean default(FALSE), not null
110   -# projects_limit :integer default(10)
  109 +# admin :boolean(1) default(FALSE), not null
  110 +# projects_limit :integer(4) default(10)
111 111 # skype :string(255) default(""), not null
112 112 # linkedin :string(255) default(""), not null
113 113 # twitter :string(255) default(""), not null
114 114 # authentication_token :string(255)
115   -# dark_scheme :boolean default(FALSE), not null
  115 +# dark_scheme :boolean(1) default(FALSE), not null
  116 +# theme_id :integer(4) default(1), not null
  117 +# bio :string(255)
  118 +# blocked :boolean(1) default(FALSE), not null
116 119 #
  120 +
... ...
app/models/users_project.rb
  Diff comments   View file @6abc649
... ... @@ -75,11 +75,11 @@ end
75 75 #
76 76 # Table name: users_projects
77 77 #
78   -# id :integer not null, primary key
79   -# user_id :integer not null
80   -# project_id :integer not null
81   -# created_at :datetime
82   -# updated_at :datetime
83   -# project_access :integer default(0), not null
  78 +# id :integer(4) not null, primary key
  79 +# user_id :integer(4) not null
  80 +# project_id :integer(4) not null
  81 +# created_at :datetime not null
  82 +# updated_at :datetime not null
  83 +# project_access :integer(4) default(0), not null
84 84 #
85 85  
... ...
app/models/web_hook.rb
  Diff comments   View file @6abc649
... ... @@ -22,10 +22,10 @@ end
22 22 #
23 23 # Table name: web_hooks
24 24 #
25   -# id :integer not null, primary key
  25 +# id :integer(4) not null, primary key
26 26 # url :string(255)
27   -# project_id :integer
28   -# created_at :datetime
29   -# updated_at :datetime
  27 +# project_id :integer(4)
  28 +# created_at :datetime not null
  29 +# updated_at :datetime not null
30 30 #
31 31  
... ...
app/models/wiki.rb
  Diff comments   View file @6abc649
... ... @@ -34,13 +34,13 @@ end
34 34 #
35 35 # Table name: wikis
36 36 #
37   -# id :integer not null, primary key
  37 +# id :integer(4) not null, primary key
38 38 # title :string(255)
39 39 # content :text
40   -# project_id :integer
  40 +# project_id :integer(4)
41 41 # created_at :datetime not null
42 42 # updated_at :datetime not null
43 43 # slug :string(255)
44   -# user_id :integer
  44 +# user_id :integer(4)
45 45 #
46 46  
... ...
spec/models/event_spec.rb
  Diff comments   View file @6abc649
... ... @@ -2,15 +2,16 @@
2 2 #
3 3 # Table name: events
4 4 #
5   -# id :integer not null, primary key
  5 +# id :integer(4) not null, primary key
6 6 # target_type :string(255)
7   -# target_id :integer
  7 +# target_id :integer(4)
8 8 # title :string(255)
9 9 # data :text
10   -# project_id :integer
  10 +# project_id :integer(4)
11 11 # created_at :datetime not null
12 12 # updated_at :datetime not null
13   -# action :integer
  13 +# action :integer(4)
  14 +# author_id :integer(4)
14 15 #
15 16  
16 17 require 'spec_helper'
... ...
spec/models/issue_spec.rb
  Diff comments   View file @6abc649
... ... @@ -112,16 +112,18 @@ end
112 112 #
113 113 # Table name: issues
114 114 #
115   -# id :integer not null, primary key
116   -# title :string(255)
117   -# assignee_id :integer
118   -# author_id :integer
119   -# project_id :integer
120   -# created_at :datetime
121   -# updated_at :datetime
122   -# closed :boolean default(FALSE), not null
123   -# position :integer default(0)
124   -# critical :boolean default(FALSE), not null
125   -# branch_name :string(255)
  115 +# id :integer(4) not null, primary key
  116 +# title :string(255)
  117 +# assignee_id :integer(4)
  118 +# author_id :integer(4)
  119 +# project_id :integer(4)
  120 +# created_at :datetime not null
  121 +# updated_at :datetime not null
  122 +# closed :boolean(1) default(FALSE), not null
  123 +# position :integer(4) default(0)
  124 +# critical :boolean(1) default(FALSE), not null
  125 +# branch_name :string(255)
  126 +# description :text
  127 +# milestone_id :integer(4)
126 128 #
127 129  
... ...
spec/models/key_spec.rb
  Diff comments   View file @6abc649
... ... @@ -53,13 +53,13 @@ end
53 53 #
54 54 # Table name: keys
55 55 #
56   -# id :integer not null, primary key
57   -# user_id :integer
58   -# created_at :datetime
59   -# updated_at :datetime
  56 +# id :integer(4) not null, primary key
  57 +# user_id :integer(4)
  58 +# created_at :datetime not null
  59 +# updated_at :datetime not null
60 60 # key :text
61 61 # title :string(255)
62 62 # identifier :string(255)
63   -# project_id :integer
  63 +# project_id :integer(4)
64 64 #
65 65  
... ...
spec/models/merge_request_spec.rb
  Diff comments   View file @6abc649
... ... @@ -62,15 +62,19 @@ end
62 62 #
63 63 # Table name: merge_requests
64 64 #
65   -# id :integer not null, primary key
  65 +# id :integer(4) not null, primary key
66 66 # target_branch :string(255) not null
67 67 # source_branch :string(255) not null
68   -# project_id :integer not null
69   -# author_id :integer
70   -# assignee_id :integer
  68 +# project_id :integer(4) not null
  69 +# author_id :integer(4)
  70 +# assignee_id :integer(4)
71 71 # title :string(255)
72   -# closed :boolean default(FALSE), not null
73   -# created_at :datetime
74   -# updated_at :datetime
  72 +# closed :boolean(1) default(FALSE), not null
  73 +# created_at :datetime not null
  74 +# updated_at :datetime not null
  75 +# st_commits :text(2147483647
  76 +# st_diffs :text(2147483647
  77 +# merged :boolean(1) default(FALSE), not null
  78 +# state :integer(4) default(1), not null
75 79 #
76 80  
... ...
spec/models/milestone_spec.rb
  Diff comments   View file @6abc649
  1 +# == Schema Information
  2 +#
  3 +# Table name: milestones
  4 +#
  5 +# id :integer(4) not null, primary key
  6 +# title :string(255) not null
  7 +# project_id :integer(4) not null
  8 +# description :text
  9 +# due_date :date
  10 +# closed :boolean(1) default(FALSE), not null
  11 +# created_at :datetime not null
  12 +# updated_at :datetime not null
  13 +#
  14 +
1 15 require 'spec_helper'
2 16  
3 17 describe Milestone do
... ...
spec/models/note_spec.rb
  Diff comments   View file @6abc649
... ... @@ -139,14 +139,14 @@ end
139 139 #
140 140 # Table name: notes
141 141 #
142   -# id :integer not null, primary key
  142 +# id :integer(4) not null, primary key
143 143 # note :text
144 144 # noteable_id :string(255)
145 145 # noteable_type :string(255)
146   -# author_id :integer
147   -# created_at :datetime
148   -# updated_at :datetime
149   -# project_id :integer
  146 +# author_id :integer(4)
  147 +# created_at :datetime not null
  148 +# updated_at :datetime not null
  149 +# project_id :integer(4)
150 150 # attachment :string(255)
151 151 # line_code :string(255)
152 152 #
... ...
spec/models/project_spec.rb
  Diff comments   View file @6abc649
... ... @@ -206,19 +206,19 @@ end
206 206 #
207 207 # Table name: projects
208 208 #
209   -# id :integer not null, primary key
  209 +# id :integer(4) not null, primary key
210 210 # name :string(255)
211 211 # path :string(255)
212 212 # description :text
213   -# created_at :datetime
214   -# updated_at :datetime
215   -# private_flag :boolean default(TRUE), not null
  213 +# created_at :datetime not null
  214 +# updated_at :datetime not null
  215 +# private_flag :boolean(1) default(TRUE), not null
216 216 # code :string(255)
217   -# owner_id :integer
  217 +# owner_id :integer(4)
218 218 # default_branch :string(255) default("master"), not null
219   -# issues_enabled :boolean default(TRUE), not null
220   -# wall_enabled :boolean default(TRUE), not null
221   -# merge_requests_enabled :boolean default(TRUE), not null
222   -# wiki_enabled :boolean default(TRUE), not null
  219 +# issues_enabled :boolean(1) default(TRUE), not null
  220 +# wall_enabled :boolean(1) default(TRUE), not null
  221 +# merge_requests_enabled :boolean(1) default(TRUE), not null
  222 +# wiki_enabled :boolean(1) default(TRUE), not null
223 223 #
224 224  
... ...
spec/models/protected_branch_spec.rb
  Diff comments   View file @6abc649
... ... @@ -2,8 +2,8 @@
2 2 #
3 3 # Table name: protected_branches
4 4 #
5   -# id :integer not null, primary key
6   -# project_id :integer not null
  5 +# id :integer(4) not null, primary key
  6 +# project_id :integer(4) not null
7 7 # name :string(255) not null
8 8 # created_at :datetime not null
9 9 # updated_at :datetime not null
... ...
spec/models/snippet_spec.rb
  Diff comments   View file @6abc649
... ... @@ -18,13 +18,13 @@ end
18 18 #
19 19 # Table name: snippets
20 20 #
21   -# id :integer not null, primary key
  21 +# id :integer(4) not null, primary key
22 22 # title :string(255)
23 23 # content :text
24   -# author_id :integer not null
25   -# project_id :integer not null
26   -# created_at :datetime
27   -# updated_at :datetime
  24 +# author_id :integer(4) not null
  25 +# project_id :integer(4) not null
  26 +# created_at :datetime not null
  27 +# updated_at :datetime not null
28 28 # file_name :string(255)
29 29 # expires_at :datetime
30 30 #
... ...
spec/models/user_spec.rb
  Diff comments   View file @6abc649
... ... @@ -46,25 +46,29 @@ end
46 46 #
47 47 # Table name: users
48 48 #
49   -# id :integer not null, primary key
  49 +# id :integer(4) not null, primary key
50 50 # email :string(255) default(""), not null
51 51 # encrypted_password :string(128) default(""), not null
52 52 # reset_password_token :string(255)
53 53 # reset_password_sent_at :datetime
54 54 # remember_created_at :datetime
55   -# sign_in_count :integer default(0)
  55 +# sign_in_count :integer(4) default(0)
56 56 # current_sign_in_at :datetime
57 57 # last_sign_in_at :datetime
58 58 # current_sign_in_ip :string(255)
59 59 # last_sign_in_ip :string(255)
60   -# created_at :datetime
61   -# updated_at :datetime
  60 +# created_at :datetime not null
  61 +# updated_at :datetime not null
62 62 # name :string(255)
63   -# admin :boolean default(FALSE), not null
64   -# projects_limit :integer default(10)
  63 +# admin :boolean(1) default(FALSE), not null
  64 +# projects_limit :integer(4) default(10)
65 65 # skype :string(255) default(""), not null
66 66 # linkedin :string(255) default(""), not null
67 67 # twitter :string(255) default(""), not null
68 68 # authentication_token :string(255)
69   -# dark_scheme :boolean default(FALSE), not null
  69 +# dark_scheme :boolean(1) default(FALSE), not null
  70 +# theme_id :integer(4) default(1), not null
  71 +# bio :string(255)
  72 +# blocked :boolean(1) default(FALSE), not null
70 73 #
  74 +
... ...
spec/models/users_project_spec.rb
  Diff comments   View file @6abc649
... ... @@ -20,11 +20,11 @@ end
20 20 #
21 21 # Table name: users_projects
22 22 #
23   -# id :integer not null, primary key
24   -# user_id :integer not null
25   -# project_id :integer not null
26   -# created_at :datetime
27   -# updated_at :datetime
28   -# project_access :integer default(0), not null
  23 +# id :integer(4) not null, primary key
  24 +# user_id :integer(4) not null
  25 +# project_id :integer(4) not null
  26 +# created_at :datetime not null
  27 +# updated_at :datetime not null
  28 +# project_access :integer(4) default(0), not null
29 29 #
30 30  
... ...
spec/models/web_hook_spec.rb
  Diff comments   View file @6abc649
... ... @@ -56,10 +56,10 @@ end
56 56 #
57 57 # Table name: web_hooks
58 58 #
59   -# id :integer not null, primary key
  59 +# id :integer(4) not null, primary key
60 60 # url :string(255)
61   -# project_id :integer
62   -# created_at :datetime
63   -# updated_at :datetime
  61 +# project_id :integer(4)
  62 +# created_at :datetime not null
  63 +# updated_at :datetime not null
64 64 #
65 65  
... ...
spec/models/wiki_spec.rb
  Diff comments   View file @6abc649
... ... @@ -16,16 +16,15 @@ describe Wiki do
16 16 end
17 17 # == Schema Information
18 18 #
19   -# Table name: snippets
  19 +# Table name: wikis
20 20 #
21   -# id :integer not null, primary key
  21 +# id :integer(4) not null, primary key
22 22 # title :string(255)
23 23 # content :text
24   -# author_id :integer not null
25   -# project_id :integer not null
26   -# created_at :datetime
27   -# updated_at :datetime
28   -# file_name :string(255)
29   -# expires_at :datetime
  24 +# project_id :integer(4)
  25 +# created_at :datetime not null
  26 +# updated_at :datetime not null
  27 +# slug :string(255)
  28 +# user_id :integer(4)
30 29 #
31 30  
... ...