diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-04-21 12:45:43 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-04-21 12:45:43 +0300 |
| commit | 7058258a2afbc3335da7568ea2e2f5337bbc00b4 (patch) | |
| tree | 96078065c3bd794c78786d18d7b4d5951aa4d9d9 /db | |
| parent | 08994f3f6034eb214de4cda304d8797a51b2397a (diff) | |
| download | gitlab-ce-7058258a2afbc3335da7568ea2e2f5337bbc00b4.tar.gz | |
Fixed db_schema & reordered rake tasks
Diffstat (limited to 'db')
| -rw-r--r-- | db/schema.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/db/schema.rb b/db/schema.rb index fc37d0b0139..b1c2cf19f67 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,8 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20120329170745) do +ActiveRecord::Schema.define(:version => 20120413135904) do + create_table "events", :force => true do |t| t.string "target_type" t.integer "target_id" @@ -64,7 +65,7 @@ ActiveRecord::Schema.define(:version => 20120329170745) do t.text "st_commits", :limit => 2147483647 t.text "st_diffs", :limit => 2147483647 t.boolean "merged", :default => false, :null => false - t.boolean "auto_merge", :default => true, :null => false + t.integer "state", :default => 1, :null => false end add_index "merge_requests", ["project_id"], :name => "index_merge_requests_on_project_id" |