merging upstream changes

3 files changed, 15 insertions, 1 deletions

diff --git a/db/migrate/20120315111711_add_commits_diff_store_to_merge_request.rb b/db/migrate/20120315111711_add_commits_diff_store_to_merge_request.rb
new file mode 100644
index 00000000000..2dc1dfb4b6e
--- /dev/null
+++ b/db/migrate/20120315111711_add_commits_diff_store_to_merge_request.rb
@@ -0,0 +1,6 @@
+class AddCommitsDiffStoreToMergeRequest < ActiveRecord::Migration
+  def change
+    add_column :merge_requests, :st_commits, :text, :null => true
+    add_column :merge_requests, :st_diffs, :text, :null => true
+  end
+end
diff --git a/db/migrate/20120315132931_add_merged_to_merge_request.rb b/db/migrate/20120315132931_add_merged_to_merge_request.rb
new file mode 100644
index 00000000000..2deb59e4420
--- /dev/null
+++ b/db/migrate/20120315132931_add_merged_to_merge_request.rb
@@ -0,0 +1,5 @@
+class AddMergedToMergeRequest < ActiveRecord::Migration
+  def change
+    add_column :merge_requests, :merged, :boolean, :null => false, :default => false
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 991401b5793..a90b6df1700 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 => 20120307095918) do
+ActiveRecord::Schema.define(:version => 20120315132931) do
 
   create_table "events", :force => true do |t|
     t.string   "target_type"
@@ -61,6 +61,9 @@ ActiveRecord::Schema.define(:version => 20120307095918) do
     t.boolean  "closed",        :default => false, :null => false
     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
   end
 
   add_index "merge_requests", ["project_id"], :name => "index_merge_requests_on_project_id"