default_branch for project & fixed project destroy

2 files changed, 8 insertions, 2 deletions

diff --git a/db/migrate/20111207211728_add_default_branch_to_project.rb b/db/migrate/20111207211728_add_default_branch_to_project.rb
new file mode 100644
index 00000000000..5c2107f7aa5
--- /dev/null
+++ b/db/migrate/20111207211728_add_default_branch_to_project.rb
@@ -0,0 +1,5 @@
+class AddDefaultBranchToProject < ActiveRecord::Migration
+  def change
+    add_column :projects, :default_branch, :string, :null => false, :default => "master"
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index fd50bf32c52..17246a614f8 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 => 20111206222316) do
+ActiveRecord::Schema.define(:version => 20111207211728) do
 
   create_table "features", :force => true do |t|
     t.string   "name"
@@ -76,9 +76,10 @@ ActiveRecord::Schema.define(:version => 20111206222316) do
     t.text     "description"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.boolean  "private_flag", :default => true, :null => false
+    t.boolean  "private_flag",   :default => true,     :null => false
     t.string   "code"
     t.integer  "owner_id"
+    t.string   "default_branch", :default => "master", :null => false
   end
 
   create_table "snippets", :force => true do |t|