diff options
| author | Steven Verbeek <sverbeek@modernmedia.ca> | 2012-03-19 21:57:29 -0300 |
|---|---|---|
| committer | Steven Verbeek <sverbeek@modernmedia.ca> | 2012-03-19 21:57:29 -0300 |
| commit | 35d0de8f367e949c3bab50506916ca87eeb5d5ab (patch) | |
| tree | 36a681fe714f608b70f595f8c5d414a943cdd370 /db/migrate | |
| parent | 2a7cd2f1b5ed824bafafeb2004746a384be44453 (diff) | |
| parent | cadf12c60cc27c5b0b8273c1de4b190a0e88bd7d (diff) | |
| download | gitlab-ce-35d0de8f367e949c3bab50506916ca87eeb5d5ab.tar.gz | |
merging upstream changes
Diffstat (limited to 'db/migrate')
| -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 |
2 files changed, 11 insertions, 0 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 |