Download as
Browse Code »

Commit e603da7360dd8141a00b8096cb67acda0e039940

Authored by Dmitriy Zaporozhets
1 parent 42f25e75
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Add Project#import_status field 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing 2 changed files with 60 additions and 46 deletions   Show diff stats
db/migrate/20140312145357_add_import_status_to_project.rb 0 → 100644
  Diff comments   View file @e603da7
... ... @@ -0,0 +1,5 @@
  1 +class AddImportStatusToProject < ActiveRecord::Migration
  2 + def change
  3 + add_column :projects, :import_status, :string
  4 + end
  5 +end
... ...
db/schema.rb
  Diff comments   View file @e603da7
... ... @@ -11,15 +11,18 @@
11 11 #
12 12 # It's strongly recommended that you check this file into your version control system.
13 13  
14   -ActiveRecord::Schema.define(version: 20140304005354) do
  14 +ActiveRecord::Schema.define(version: 20140312145357) do
  15 +
  16 + # These are extensions that must be enabled in order to support this database
  17 + enable_extension "plpgsql"
15 18  
16 19 create_table "broadcast_messages", force: true do |t|
17 20 t.text "message", null: false
18 21 t.datetime "starts_at"
19 22 t.datetime "ends_at"
20 23 t.integer "alert_type"
21   - t.datetime "created_at", null: false
22   - t.datetime "updated_at", null: false
  24 + t.datetime "created_at"
  25 + t.datetime "updated_at"
23 26 t.string "color"
24 27 t.string "font"
25 28 end
... ... @@ -27,8 +30,8 @@ ActiveRecord::Schema.define(version: 20140304005354) do
27 30 create_table "deploy_keys_projects", force: true do |t|
28 31 t.integer "deploy_key_id", null: false
29 32 t.integer "project_id", null: false
30   - t.datetime "created_at", null: false
31   - t.datetime "updated_at", null: false
  33 + t.datetime "created_at"
  34 + t.datetime "updated_at"
32 35 end
33 36  
34 37 add_index "deploy_keys_projects", ["project_id"], name: "index_deploy_keys_projects_on_project_id", using: :btree
... ... @@ -49,8 +52,8 @@ ActiveRecord::Schema.define(version: 20140304005354) do
49 52 t.string "title"
50 53 t.text "data"
51 54 t.integer "project_id"
52   - t.datetime "created_at", null: false
53   - t.datetime "updated_at", null: false
  55 + t.datetime "created_at"
  56 + t.datetime "updated_at"
54 57 t.integer "action"
55 58 t.integer "author_id"
56 59 end
... ... @@ -65,8 +68,8 @@ ActiveRecord::Schema.define(version: 20140304005354) do
65 68 create_table "forked_project_links", force: true do |t|
66 69 t.integer "forked_to_project_id", null: false
67 70 t.integer "forked_from_project_id", null: false
68   - t.datetime "created_at", null: false
69   - t.datetime "updated_at", null: false
  71 + t.datetime "created_at"
  72 + t.datetime "updated_at"
70 73 end
71 74  
72 75 add_index "forked_project_links", ["forked_to_project_id"], name: "index_forked_project_links_on_forked_to_project_id", unique: true, using: :btree
... ... @@ -106,10 +109,10 @@ ActiveRecord::Schema.define(version: 20140304005354) do
106 109 add_index "keys", ["user_id"], name: "index_keys_on_user_id", using: :btree
107 110  
108 111 create_table "merge_request_diffs", force: true do |t|
109   - t.string "state", default: "collected", null: false
110   - t.text "st_commits", limit: 2147483647
111   - t.text "st_diffs", limit: 2147483647
112   - t.integer "merge_request_id", null: false
  112 + t.string "state", default: "collected", null: false
  113 + t.text "st_commits"
  114 + t.text "st_diffs"
  115 + t.integer "merge_request_id", null: false
113 116 t.datetime "created_at"
114 117 t.datetime "updated_at"
115 118 end
... ... @@ -138,7 +141,7 @@ ActiveRecord::Schema.define(version: 20140304005354) do
138 141 add_index "merge_requests", ["created_at"], name: "index_merge_requests_on_created_at", using: :btree
139 142 add_index "merge_requests", ["milestone_id"], name: "index_merge_requests_on_milestone_id", using: :btree
140 143 add_index "merge_requests", ["source_branch"], name: "index_merge_requests_on_source_branch", using: :btree
141   - add_index "merge_requests", ["source_project_id"], name: "index_merge_requests_on_project_id", using: :btree
  144 + add_index "merge_requests", ["source_project_id"], name: "index_merge_requests_on_source_project_id", using: :btree
142 145 add_index "merge_requests", ["target_branch"], name: "index_merge_requests_on_target_branch", using: :btree
143 146 add_index "merge_requests", ["title"], name: "index_merge_requests_on_title", using: :btree
144 147  
... ... @@ -147,8 +150,8 @@ ActiveRecord::Schema.define(version: 20140304005354) do
147 150 t.integer "project_id", null: false
148 151 t.text "description"
149 152 t.date "due_date"
150   - t.datetime "created_at", null: false
151   - t.datetime "updated_at", null: false
  153 + t.datetime "created_at"
  154 + t.datetime "updated_at"
152 155 t.string "state"
153 156 t.integer "iid"
154 157 end
... ... @@ -160,8 +163,8 @@ ActiveRecord::Schema.define(version: 20140304005354) do
160 163 t.string "name", null: false
161 164 t.string "path", null: false
162 165 t.integer "owner_id"
163   - t.datetime "created_at", null: false
164   - t.datetime "updated_at", null: false
  166 + t.datetime "created_at"
  167 + t.datetime "updated_at"
165 168 t.string "type"
166 169 t.string "description", default: "", null: false
167 170 t.string "avatar"
... ... @@ -183,8 +186,8 @@ ActiveRecord::Schema.define(version: 20140304005354) do
183 186 t.string "line_code"
184 187 t.string "commit_id"
185 188 t.integer "noteable_id"
186   - t.text "st_diff"
187 189 t.boolean "system", default: false, null: false
  190 + t.text "st_diff"
188 191 end
189 192  
190 193 add_index "notes", ["author_id"], name: "index_notes_on_author_id", using: :btree
... ... @@ -215,17 +218,18 @@ ActiveRecord::Schema.define(version: 20140304005354) do
215 218 t.string "import_url"
216 219 t.integer "visibility_level", default: 0, null: false
217 220 t.boolean "archived", default: false, null: false
  221 + t.string "import_status"
218 222 end
219 223  
220   - add_index "projects", ["creator_id"], name: "index_projects_on_owner_id", using: :btree
  224 + add_index "projects", ["creator_id"], name: "index_projects_on_creator_id", using: :btree
221 225 add_index "projects", ["last_activity_at"], name: "index_projects_on_last_activity_at", using: :btree
222 226 add_index "projects", ["namespace_id"], name: "index_projects_on_namespace_id", using: :btree
223 227  
224 228 create_table "protected_branches", force: true do |t|
225 229 t.integer "project_id", null: false
226 230 t.string "name", null: false
227   - t.datetime "created_at", null: false
228   - t.datetime "updated_at", null: false
  231 + t.datetime "created_at"
  232 + t.datetime "updated_at"
229 233 end
230 234  
231 235 add_index "protected_branches", ["project_id"], name: "index_protected_branches_on_project_id", using: :btree
... ... @@ -235,8 +239,8 @@ ActiveRecord::Schema.define(version: 20140304005354) do
235 239 t.string "title"
236 240 t.string "token"
237 241 t.integer "project_id", null: false
238   - t.datetime "created_at", null: false
239   - t.datetime "updated_at", null: false
  242 + t.datetime "created_at"
  243 + t.datetime "updated_at"
240 244 t.boolean "active", default: false, null: false
241 245 t.string "project_url"
242 246 t.string "subdomain"
... ... @@ -249,14 +253,14 @@ ActiveRecord::Schema.define(version: 20140304005354) do
249 253  
250 254 create_table "snippets", force: true do |t|
251 255 t.string "title"
252   - t.text "content", limit: 2147483647
253   - t.integer "author_id", null: false
  256 + t.text "content"
  257 + t.integer "author_id", null: false
254 258 t.integer "project_id"
255 259 t.datetime "created_at"
256 260 t.datetime "updated_at"
257 261 t.string "file_name"
258 262 t.datetime "expires_at"
259   - t.boolean "private", default: true, null: false
  263 + t.boolean "private", default: true, null: false
260 264 t.string "type"
261 265 end
262 266  
... ... @@ -275,17 +279,20 @@ ActiveRecord::Schema.define(version: 20140304005354) do
275 279 t.datetime "created_at"
276 280 end
277 281  
  282 + add_index "taggings", ["tag_id"], name: "index_taggings_on_tag_id", using: :btree
  283 + add_index "taggings", ["taggable_id", "taggable_type", "context"], name: "index_taggings_on_taggable_id_and_taggable_type_and_context", using: :btree
  284 +
278 285 create_table "tags", force: true do |t|
279 286 t.string "name"
280 287 end
281 288  
282 289 create_table "users", force: true do |t|
283   - t.string "email", default: "", null: false
284   - t.string "encrypted_password", limit: 128, default: "", null: false
  290 + t.string "email", default: "", null: false
  291 + t.string "encrypted_password", default: "", null: false
285 292 t.string "reset_password_token"
286 293 t.datetime "reset_password_sent_at"
287 294 t.datetime "remember_created_at"
288   - t.integer "sign_in_count", default: 0
  295 + t.integer "sign_in_count", default: 0
289 296 t.datetime "current_sign_in_at"
290 297 t.datetime "last_sign_in_at"
291 298 t.string "current_sign_in_ip"
... ... @@ -293,40 +300,41 @@ ActiveRecord::Schema.define(version: 20140304005354) do
293 300 t.datetime "created_at"
294 301 t.datetime "updated_at"
295 302 t.string "name"
296   - t.boolean "admin", default: false, null: false
297   - t.integer "projects_limit", default: 10
298   - t.string "skype", default: "", null: false
299   - t.string "linkedin", default: "", null: false
300   - t.string "twitter", default: "", null: false
  303 + t.boolean "admin", default: false, null: false
  304 + t.integer "projects_limit", default: 10
  305 + t.string "skype", default: "", null: false
  306 + t.string "linkedin", default: "", null: false
  307 + t.string "twitter", default: "", null: false
301 308 t.string "authentication_token"
302   - t.integer "theme_id", default: 1, null: false
  309 + t.integer "theme_id", default: 1, null: false
303 310 t.string "bio"
304   - t.integer "failed_attempts", default: 0
  311 + t.integer "failed_attempts", default: 0
305 312 t.datetime "locked_at"
306 313 t.string "extern_uid"
307 314 t.string "provider"
308 315 t.string "username"
309   - t.boolean "can_create_group", default: true, null: false
310   - t.boolean "can_create_team", default: true, null: false
  316 + t.boolean "can_create_group", default: true, null: false
  317 + t.boolean "can_create_team", default: true, null: false
311 318 t.string "state"
312   - t.integer "color_scheme_id", default: 1, null: false
313   - t.integer "notification_level", default: 1, null: false
  319 + t.integer "color_scheme_id", default: 1, null: false
  320 + t.integer "notification_level", default: 1, null: false
314 321 t.datetime "password_expires_at"
315 322 t.integer "created_by_id"
  323 + t.datetime "last_credential_check_at"
316 324 t.string "avatar"
317 325 t.string "confirmation_token"
318 326 t.datetime "confirmed_at"
319 327 t.datetime "confirmation_sent_at"
320 328 t.string "unconfirmed_email"
321   - t.boolean "hide_no_ssh_key", default: false
322   - t.string "website_url", default: "", null: false
323   - t.datetime "last_credential_check_at"
  329 + t.boolean "hide_no_ssh_key", default: false
  330 + t.string "website_url", default: "", null: false
324 331 end
325 332  
326 333 add_index "users", ["admin"], name: "index_users_on_admin", using: :btree
327 334 add_index "users", ["authentication_token"], name: "index_users_on_authentication_token", unique: true, using: :btree
328 335 add_index "users", ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true, using: :btree
329 336 add_index "users", ["email"], name: "index_users_on_email", unique: true, using: :btree
  337 + add_index "users", ["extern_uid", "provider"], name: "index_users_on_extern_uid_and_provider", unique: true, using: :btree
330 338 add_index "users", ["name"], name: "index_users_on_name", using: :btree
331 339 add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true, using: :btree
332 340 add_index "users", ["username"], name: "index_users_on_username", using: :btree
... ... @@ -335,8 +343,8 @@ ActiveRecord::Schema.define(version: 20140304005354) do
335 343 t.integer "group_access", null: false
336 344 t.integer "group_id", null: false
337 345 t.integer "user_id", null: false
338   - t.datetime "created_at", null: false
339   - t.datetime "updated_at", null: false
  346 + t.datetime "created_at"
  347 + t.datetime "updated_at"
340 348 t.integer "notification_level", default: 3, null: false
341 349 end
342 350  
... ... @@ -365,6 +373,7 @@ ActiveRecord::Schema.define(version: 20140304005354) do
365 373 t.boolean "push_events", default: true, null: false
366 374 t.boolean "issues_events", default: false, null: false
367 375 t.boolean "merge_requests_events", default: false, null: false
  376 + t.boolean "tag_push_events", default: false
368 377 end
369 378  
370 379 add_index "web_hooks", ["project_id"], name: "index_web_hooks_on_project_id", using: :btree
... ...