deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Link for auto merge, db field for MR

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-03-30 00:27:42 +03:00
parent 78d620b3b6
commit cd74f9da91
5 changed files with 61 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

6
db/migrate/20120329170745_add_automerge_to_merge_request.rb Normal file
View file

@ -0,0 +1,6 @@
class AddAutomergeToMergeRequest < ActiveRecord::Migration
def change
add_column :merge_requests, :auto_merge, :boolean, :null => false, :default => true
end
end

39
db/schema.rb
View file

@ -11,7 +11,7 @@
#
# It's strongly recommended to check this file into your version control system.
ActiveRecord::Schema.define(:version => 20120323221339) do
ActiveRecord::Schema.define(:version => 20120329170745) do
create_table "events", :force => true do |t|
t.string "target_type"
@ -30,8 +30,8 @@ ActiveRecord::Schema.define(:version => 20120323221339) do
t.integer "assignee_id"
t.integer "author_id"
t.integer "project_id"
t.datetime "created_at"
t.datetime "updated_at"
t.datetime "created_at", :null => false
t.datetime "updated_at", :null => false
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 => 20120323221339) do
create_table "keys", :force => true do |t|
t.integer "user_id"
t.datetime "created_at"
t.datetime "updated_at"
t.datetime "created_at", :null => false
t.datetime "updated_at", :null => false
t.text "key"
t.string "title"
t.string "identifier"
@ -59,11 +59,12 @@ ActiveRecord::Schema.define(:version => 20120323221339) do
t.integer "assignee_id"
t.string "title"
t.boolean "closed", :default => false, :null => false
t.datetime "created_at"
t.datetime "updated_at"
t.datetime "created_at", :null => false
t.datetime "updated_at", :null => false
t.text "st_commits"
t.text "st_diffs"
t.boolean "merged", :default => false, :null => false
t.boolean "auto_merge", :default => true, :null => false
end
add_index "merge_requests", ["project_id"], :name => "index_merge_requests_on_project_id"
@ -73,8 +74,8 @@ ActiveRecord::Schema.define(:version => 20120323221339) do
t.string "noteable_id"
t.string "noteable_type"
t.integer "author_id"
t.datetime "created_at"
t.datetime "updated_at"
t.datetime "created_at", :null => false
t.datetime "updated_at", :null => false
t.integer "project_id"
t.string "attachment"
t.string "line_code"
@ -87,8 +88,8 @@ ActiveRecord::Schema.define(:version => 20120323221339) do
t.string "name"
t.string "path"
t.text "description"
t.datetime "created_at"
t.datetime "updated_at"
t.datetime "created_at", :null => false
t.datetime "updated_at", :null => false
t.boolean "private_flag", :default => true, :null => false
t.string "code"
t.integer "owner_id"
@ -111,8 +112,8 @@ ActiveRecord::Schema.define(:version => 20120323221339) do
t.text "content"
t.integer "author_id", :null => false
t.integer "project_id", :null => false
t.datetime "created_at"
t.datetime "updated_at"
t.datetime "created_at", :null => false
t.datetime "updated_at", :null => false
t.string "file_name"
t.datetime "expires_at"
end
@ -145,8 +146,8 @@ ActiveRecord::Schema.define(:version => 20120323221339) do
t.datetime "last_sign_in_at"
t.string "current_sign_in_ip"
t.string "last_sign_in_ip"
t.datetime "created_at"
t.datetime "updated_at"
t.datetime "created_at", :null => false
t.datetime "updated_at", :null => false
t.string "name"
t.boolean "admin", :default => false, :null => false
t.integer "projects_limit", :default => 10
@ -165,16 +166,16 @@ ActiveRecord::Schema.define(:version => 20120323221339) 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"
t.datetime "updated_at"
t.datetime "created_at", :null => false
t.datetime "updated_at", :null => false
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"
t.datetime "updated_at"
t.datetime "created_at", :null => false
t.datetime "updated_at", :null => false
end
create_table "wikis", :force => true do |t|