Download as
Browse Code »

Commit 87f555e1ef26205633ff6458623054c6a95b983b

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

fixed db/schema

Showing 1 changed file with 11 additions and 16 deletions   Show diff stats
db/schema.rb
  Diff comments   View file @87f555e
... ... @@ -106,11 +106,11 @@ ActiveRecord::Schema.define(:version => 20130220133245) do
106 106 add_index "milestones", ["project_id"], :name => "index_milestones_on_project_id"
107 107  
108 108 create_table "namespaces", :force => true do |t|
109   - t.string "name", :null => false
110   - t.string "path", :null => false
111   - t.integer "owner_id", :null => false
112   - t.datetime "created_at", :null => false
113   - t.datetime "updated_at", :null => false
  109 + t.string "name", :null => false
  110 + t.string "path", :null => false
  111 + t.integer "owner_id", :null => false
  112 + t.datetime "created_at", :null => false
  113 + t.datetime "updated_at", :null => false
114 114 t.string "type"
115 115 t.string "description", :default => "", :null => false
116 116 end
... ... @@ -143,14 +143,14 @@ ActiveRecord::Schema.define(:version => 20130220133245) do
143 143 t.string "name"
144 144 t.string "path"
145 145 t.text "description"
146   - t.datetime "created_at", :null => false
147   - t.datetime "updated_at", :null => false
  146 + t.datetime "created_at", :null => false
  147 + t.datetime "updated_at", :null => false
148 148 t.integer "creator_id"
149 149 t.string "default_branch"
150   - t.boolean "issues_enabled", :default => true, :null => false
151   - t.boolean "wall_enabled", :default => true, :null => false
152   - t.boolean "merge_requests_enabled", :default => true, :null => false
153   - t.boolean "wiki_enabled", :default => true, :null => false
  150 + t.boolean "issues_enabled", :default => true, :null => false
  151 + t.boolean "wall_enabled", :default => true, :null => false
  152 + t.boolean "merge_requests_enabled", :default => true, :null => false
  153 + t.boolean "wiki_enabled", :default => true, :null => false
154 154 t.integer "namespace_id"
155 155 t.boolean "public", :default => false, :null => false
156 156 t.string "issues_tracker", :default => "gitlab", :null => false
... ... @@ -233,14 +233,9 @@ ActiveRecord::Schema.define(:version => 20130220133245) do
233 233 t.string "name"
234 234 t.string "path"
235 235 t.integer "owner_id"
236   -<<<<<<< HEAD
237   - t.datetime "created_at", :null => false
238   - t.datetime "updated_at", :null => false
239   -=======
240 236 t.datetime "created_at", :null => false
241 237 t.datetime "updated_at", :null => false
242 238 t.string "description", :default => "", :null => false
243   ->>>>>>> 2f1f05d431d1df062e46365930b98b358554a07d
244 239 end
245 240  
246 241 create_table "users", :force => true do |t|
... ...