diff options
author | randx <dmitriy.zaporozhets@gmail.com> | 2012-03-30 08:05:04 +0300 |
---|---|---|
committer | randx <dmitriy.zaporozhets@gmail.com> | 2012-03-30 08:05:04 +0300 |
commit | 411d84f385364be987380da5f0216048073609c9 (patch) | |
tree | cc9e86019b41b2d3401131bfc6dc1f685422dab1 /db | |
parent | cd74f9da91cb1b798a8654f725b502bac256228d (diff) | |
download | gitlab-ce-411d84f385364be987380da5f0216048073609c9.tar.gz |
Better merge handling. show if MR can be accepted or not
Diffstat (limited to 'db')
-rw-r--r-- | db/migrate/20120329170745_add_automerge_to_merge_request.rb | 3 | ||||
-rw-r--r-- | db/schema.rb | 38 |
2 files changed, 20 insertions, 21 deletions
diff --git a/db/migrate/20120329170745_add_automerge_to_merge_request.rb b/db/migrate/20120329170745_add_automerge_to_merge_request.rb index 609c3094c8c..de7c68ee1cb 100644 --- a/db/migrate/20120329170745_add_automerge_to_merge_request.rb +++ b/db/migrate/20120329170745_add_automerge_to_merge_request.rb @@ -1,6 +1,5 @@ class AddAutomergeToMergeRequest < ActiveRecord::Migration def change - add_column :merge_requests, :auto_merge, :boolean, :null => false, :default => true - + add_column :merge_requests, :state, :integer, :null => false, :default => 1 end end diff --git a/db/schema.rb b/db/schema.rb index ff03d504b24..7b9d431de4b 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -30,8 +30,8 @@ ActiveRecord::Schema.define(:version => 20120329170745) do t.integer "assignee_id" t.integer "author_id" t.integer "project_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false + t.datetime "created_at" + t.datetime "updated_at" t.boolean "closed", :default => false, :null => false t.integer "position", :default => 0 t.boolean "critical", :default => false, :null => false @@ -43,8 +43,8 @@ ActiveRecord::Schema.define(:version => 20120329170745) do create_table "keys", :force => true do |t| t.integer "user_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false + t.datetime "created_at" + t.datetime "updated_at" t.text "key" t.string "title" t.string "identifier" @@ -59,12 +59,12 @@ ActiveRecord::Schema.define(:version => 20120329170745) do t.integer "assignee_id" t.string "title" t.boolean "closed", :default => false, :null => false - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false + t.datetime "created_at" + t.datetime "updated_at" t.text "st_commits" t.text "st_diffs" 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" @@ -74,8 +74,8 @@ ActiveRecord::Schema.define(:version => 20120329170745) do t.string "noteable_id" t.string "noteable_type" t.integer "author_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false + t.datetime "created_at" + t.datetime "updated_at" t.integer "project_id" t.string "attachment" t.string "line_code" @@ -88,8 +88,8 @@ ActiveRecord::Schema.define(:version => 20120329170745) do t.string "name" t.string "path" t.text "description" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false + t.datetime "created_at" + t.datetime "updated_at" t.boolean "private_flag", :default => true, :null => false t.string "code" t.integer "owner_id" @@ -112,8 +112,8 @@ ActiveRecord::Schema.define(:version => 20120329170745) do t.text "content" t.integer "author_id", :null => false t.integer "project_id", :null => false - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false + t.datetime "created_at" + t.datetime "updated_at" t.string "file_name" t.datetime "expires_at" end @@ -146,8 +146,8 @@ ActiveRecord::Schema.define(:version => 20120329170745) do t.datetime "last_sign_in_at" t.string "current_sign_in_ip" t.string "last_sign_in_ip" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false + t.datetime "created_at" + t.datetime "updated_at" t.string "name" t.boolean "admin", :default => false, :null => false t.integer "projects_limit", :default => 10 @@ -166,16 +166,16 @@ ActiveRecord::Schema.define(:version => 20120329170745) do create_table "users_projects", :force => true do |t| t.integer "user_id", :null => false t.integer "project_id", :null => false - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false + t.datetime "created_at" + t.datetime "updated_at" t.integer "project_access", :default => 0, :null => false end create_table "web_hooks", :force => true do |t| t.string "url" t.integer "project_id" - t.datetime "created_at", :null => false - t.datetime "updated_at", :null => false + t.datetime "created_at" + t.datetime "updated_at" end create_table "wikis", :force => true do |t| |