merge request entity

2 files changed, 30 insertions, 1 deletions

diff --git a/db/migrate/20111127155345_create_merge_requests.rb b/db/migrate/20111127155345_create_merge_requests.rb
new file mode 100644
index 00000000000..1555ae84041
--- /dev/null
+++ b/db/migrate/20111127155345_create_merge_requests.rb
@@ -0,0 +1,15 @@
+class CreateMergeRequests < ActiveRecord::Migration
+  def change
+    create_table :merge_requests do |t|
+      t.string :target_branch, :null => false
+      t.string :source_branch, :null => false
+      t.integer :project_id, :null => false
+      t.integer :author_id
+      t.integer :assignee_id
+      t.string :title
+      t.boolean :closed, :default => false, :null => false
+
+      t.timestamps
+    end
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 502f52ad9cb..8ffd874c7b7 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20111124115339) do
+ActiveRecord::Schema.define(:version => 20111127155345) do
 
   create_table "features", :force => true do |t|
     t.string   "name"
@@ -21,6 +21,8 @@ ActiveRecord::Schema.define(:version => 20111124115339) do
     t.integer  "project_id"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.string   "version"
+    t.integer  "status",      :default => 0, :null => false
   end
 
   create_table "issues", :force => true do |t|
@@ -45,6 +47,18 @@ ActiveRecord::Schema.define(:version => 20111124115339) do
     t.string   "identifier"
   end
 
+  create_table "merge_requests", :force => true do |t|
+    t.string   "target_branch",                    :null => false
+    t.string   "source_branch",                    :null => false
+    t.integer  "project_id",                       :null => false
+    t.integer  "author_id"
+    t.integer  "assignee_id"
+    t.string   "title"
+    t.boolean  "closed",        :default => false, :null => false
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
   create_table "notes", :force => true do |t|
     t.text     "note"
     t.string   "noteable_id"