Merge branch '6-0-stable' of dev.gitlab.org:gitlab/gitlabhq

app/controllers/groups_controller.rb

@@ -89,7 +89,6 @@ class GroupsController < ApplicationController
   end
 
   def destroy
-    @group.truncate_teams
     @group.destroy
 
     redirect_to root_path, notice: 'Group was removed.'

db/migrate/20130419190306_allow_merges_for_forks.rb

 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