Commit 1b7b17d12a9f176dd305b9ec95bd50ba3f56f520
1 parent
8ba27b7b
Exists in
master
and in
4 other branches
Database schema updated
Showing
1 changed file
with
25 additions
and
21 deletions
Show diff stats
db/schema.rb
| @@ -11,7 +11,7 @@ | @@ -11,7 +11,7 @@ | ||
| 11 | # | 11 | # |
| 12 | # It's strongly recommended to check this file into your version control system. | 12 | # It's strongly recommended to check this file into your version control system. |
| 13 | 13 | ||
| 14 | -ActiveRecord::Schema.define(:version => 20130218141554) do | 14 | +ActiveRecord::Schema.define(:version => 20130220133245) do |
| 15 | 15 | ||
| 16 | create_table "events", :force => true do |t| | 16 | create_table "events", :force => true do |t| |
| 17 | t.string "target_type" | 17 | t.string "target_type" |
| @@ -68,19 +68,19 @@ ActiveRecord::Schema.define(:version => 20130218141554) do | @@ -68,19 +68,19 @@ ActiveRecord::Schema.define(:version => 20130218141554) do | ||
| 68 | add_index "keys", ["user_id"], :name => "index_keys_on_user_id" | 68 | add_index "keys", ["user_id"], :name => "index_keys_on_user_id" |
| 69 | 69 | ||
| 70 | create_table "merge_requests", :force => true do |t| | 70 | create_table "merge_requests", :force => true do |t| |
| 71 | - t.string "target_branch", :null => false | ||
| 72 | - t.string "source_branch", :null => false | ||
| 73 | - t.integer "project_id", :null => false | 71 | + t.string "target_branch", :null => false |
| 72 | + t.string "source_branch", :null => false | ||
| 73 | + t.integer "project_id", :null => false | ||
| 74 | t.integer "author_id" | 74 | t.integer "author_id" |
| 75 | t.integer "assignee_id" | 75 | t.integer "assignee_id" |
| 76 | t.string "title" | 76 | t.string "title" |
| 77 | - t.datetime "created_at", :null => false | ||
| 78 | - t.datetime "updated_at", :null => false | 77 | + t.datetime "created_at", :null => false |
| 78 | + t.datetime "updated_at", :null => false | ||
| 79 | t.text "st_commits", :limit => 2147483647 | 79 | t.text "st_commits", :limit => 2147483647 |
| 80 | t.text "st_diffs", :limit => 2147483647 | 80 | t.text "st_diffs", :limit => 2147483647 |
| 81 | - t.integer "merge_status", :default => 1, :null => false | ||
| 82 | t.integer "milestone_id" | 81 | t.integer "milestone_id" |
| 83 | t.string "state" | 82 | t.string "state" |
| 83 | + t.string "merge_status" | ||
| 84 | end | 84 | end |
| 85 | 85 | ||
| 86 | add_index "merge_requests", ["assignee_id"], :name => "index_merge_requests_on_assignee_id" | 86 | add_index "merge_requests", ["assignee_id"], :name => "index_merge_requests_on_assignee_id" |
| @@ -106,12 +106,13 @@ ActiveRecord::Schema.define(:version => 20130218141554) do | @@ -106,12 +106,13 @@ ActiveRecord::Schema.define(:version => 20130218141554) do | ||
| 106 | add_index "milestones", ["project_id"], :name => "index_milestones_on_project_id" | 106 | add_index "milestones", ["project_id"], :name => "index_milestones_on_project_id" |
| 107 | 107 | ||
| 108 | create_table "namespaces", :force => true do |t| | 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 | t.string "type" | 114 | t.string "type" |
| 115 | + t.string "description", :default => "", :null => false | ||
| 115 | end | 116 | end |
| 116 | 117 | ||
| 117 | add_index "namespaces", ["name"], :name => "index_namespaces_on_name" | 118 | add_index "namespaces", ["name"], :name => "index_namespaces_on_name" |
| @@ -142,16 +143,18 @@ ActiveRecord::Schema.define(:version => 20130218141554) do | @@ -142,16 +143,18 @@ ActiveRecord::Schema.define(:version => 20130218141554) do | ||
| 142 | t.string "name" | 143 | t.string "name" |
| 143 | t.string "path" | 144 | t.string "path" |
| 144 | t.text "description" | 145 | t.text "description" |
| 145 | - t.datetime "created_at", :null => false | ||
| 146 | - t.datetime "updated_at", :null => false | 146 | + t.datetime "created_at", :null => false |
| 147 | + t.datetime "updated_at", :null => false | ||
| 147 | t.integer "creator_id" | 148 | t.integer "creator_id" |
| 148 | t.string "default_branch" | 149 | t.string "default_branch" |
| 149 | - t.boolean "issues_enabled", :default => true, :null => false | ||
| 150 | - t.boolean "wall_enabled", :default => true, :null => false | ||
| 151 | - t.boolean "merge_requests_enabled", :default => true, :null => false | ||
| 152 | - 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 | ||
| 153 | t.integer "namespace_id" | 154 | t.integer "namespace_id" |
| 154 | - t.boolean "public", :default => false, :null => false | 155 | + t.boolean "public", :default => false, :null => false |
| 156 | + t.string "issues_tracker", :default => "gitlab", :null => false | ||
| 157 | + t.string "issues_tracker_id" | ||
| 155 | end | 158 | end |
| 156 | 159 | ||
| 157 | add_index "projects", ["creator_id"], :name => "index_projects_on_owner_id" | 160 | add_index "projects", ["creator_id"], :name => "index_projects_on_owner_id" |
| @@ -230,8 +233,9 @@ ActiveRecord::Schema.define(:version => 20130218141554) do | @@ -230,8 +233,9 @@ ActiveRecord::Schema.define(:version => 20130218141554) do | ||
| 230 | t.string "name" | 233 | t.string "name" |
| 231 | t.string "path" | 234 | t.string "path" |
| 232 | t.integer "owner_id" | 235 | t.integer "owner_id" |
| 233 | - t.datetime "created_at", :null => false | ||
| 234 | - t.datetime "updated_at", :null => false | 236 | + t.datetime "created_at", :null => false |
| 237 | + t.datetime "updated_at", :null => false | ||
| 238 | + t.string "description", :default => "", :null => false | ||
| 235 | end | 239 | end |
| 236 | 240 | ||
| 237 | create_table "users", :force => true do |t| | 241 | create_table "users", :force => true do |t| |