diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-03-15 00:57:43 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-03-15 00:57:43 +0200 |
| commit | 5a3f23f395eef87bf3457e6474bac82333e71ec8 (patch) | |
| tree | 248f5314979c9f86149b3a268cda4f182b402141 /db | |
| parent | 27e36998143adca9427750fc90caec1271a4e3d0 (diff) | |
| download | gitlab-ce-5a3f23f395eef87bf3457e6474bac82333e71ec8.tar.gz | |
Persist Merge Request diff. Auto merge request close on push
Diffstat (limited to 'db')
| -rw-r--r-- | db/migrate/20120315111711_add_commits_diff_store_to_merge_request.rb | 6 | ||||
| -rw-r--r-- | db/migrate/20120315132931_add_merged_to_merge_request.rb | 5 | ||||
| -rw-r--r-- | db/schema.rb | 17 |
3 files changed, 14 insertions, 14 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..1db590ae416 --- /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, :true, :null => false, :default => false + end +end diff --git a/db/schema.rb b/db/schema.rb index 45e18a68cf3..886fdf8f426 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" @@ -50,19 +50,8 @@ ActiveRecord::Schema.define(:version => 20120307095918) do t.integer "project_id" 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", :null => false - t.datetime "updated_at", :null => false - end - - add_index "merge_requests", ["project_id"], :name => "index_merge_requests_on_project_id" +# Could not dump table "merge_requests" because of following StandardError +# Unknown type 'true' for column 'merged' create_table "notes", :force => true do |t| t.text "note" |