Merge branch 'master' into deploy_keys

Conflicts:
	app/models/project.rb

db/migrate/20111214091851_create_web_hooks.rb

@@ -0,0 +1,9 @@
+class CreateWebHooks < ActiveRecord::Migration
+  def change
+    create_table :web_hooks do |t|
+      t.string :url
+      t.integer :project_id
+      t.timestamps
+    end
+  end
+end

db/schema.rb

@@ -13,18 +13,6 @@
 
 ActiveRecord::Schema.define(:version => 20111220190817) do
 
-  create_table "features", :force => true do |t|
-    t.string   "name"
-    t.string   "branch_name"
-    t.integer  "assignee_id"
-    t.integer  "author_id"
-    t.integer  "project_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.string   "version"
-    t.integer  "status",      :default => 0, :null => false
-  end
-
   create_table "issues", :force => true do |t|
     t.string   "title"
     t.integer  "assignee_id"
@@ -145,4 +133,11 @@ ActiveRecord::Schema.define(:version => 20111220190817) do
     t.integer  "project_access", :default => 0, :null => false
   end
 
+  create_table "web_hooks", :force => true do |t|
+    t.string   "url"
+    t.integer  "project_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
 end