Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordsekretov <d.sekretov@gmail.com>2013-08-23 13:34:08 +0400
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-08-25 22:47:04 +0400
commitb1358639c8943a1e3a4e46e08a429a0f4a29ecf1 (patch)
tree7c1a8dc52ad8c66d4d0ed904ed867b82123dd128 /db/migrate/20130419190306_allow_merges_for_forks.rb
parentf834385a1dba246b942429806667ec8f828acc85 (diff)
Update 20130419190306_allow_merges_for_forks.rb
Postgress db migrate fails.(5.4=>6.0)
Diffstat (limited to 'db/migrate/20130419190306_allow_merges_for_forks.rb')
-rw-r--r--db/migrate/20130419190306_allow_merges_for_forks.rb3
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