diff options
| author | dsekretov <d.sekretov@gmail.com> | 2013-08-23 13:34:08 +0400 |
|---|---|---|
| committer | dsekretov <d.sekretov@gmail.com> | 2013-08-23 13:34:08 +0400 |
| commit | 8c4554bd235d4390f6a6d3b18a8e1e5123671b89 (patch) | |
| tree | 41a9b09c9fa84abc26cfbf6aeb3823f044e2946c | |
| parent | 86c9737307fb2fe61f5e4c2dab79d1cf08c4bdac (diff) | |
| download | gitlab-ce-8c4554bd235d4390f6a6d3b18a8e1e5123671b89.tar.gz | |
Update 20130419190306_allow_merges_for_forks.rb
Postgress db migrate fails.(5.4=>6.0)
| -rw-r--r-- | db/migrate/20130419190306_allow_merges_for_forks.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/db/migrate/20130419190306_allow_merges_for_forks.rb b/db/migrate/20130419190306_allow_merges_for_forks.rb index 691293a1c3e..56ce58a846d 100644 --- a/db/migrate/20130419190306_allow_merges_for_forks.rb +++ b/db/migrate/20130419190306_allow_merges_for_forks.rb @@ -1,7 +1,8 @@ class AllowMergesForForks < ActiveRecord::Migration def self.up - add_column :merge_requests, :target_project_id, :integer, :null => false + add_column :merge_requests, :target_project_id, :integer, :null => true MergeRequest.update_all("target_project_id = project_id") + change_column :merge_requests, :target_project_id, :integer, :null => false rename_column :merge_requests, :project_id, :source_project_id end |