Merge branch 'web_hooks' of https://github.com/ariejan/gitlabhq into ariejan-web_hooks

Conflicts:
	app/models/project.rb
	config/routes.rb
	db/schema.rb

2 files changed, 23 insertions, 0 deletions

diff --git a/db/migrate/20111214091851_create_web_hooks.rb b/db/migrate/20111214091851_create_web_hooks.rb
new file mode 100644
index 00000000000..c6ba89c10e1
--- /dev/null
+++ b/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
diff --git a/db/schema.rb b/db/schema.rb
index 18a3486ee55..7b500f1437c 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -145,4 +145,18 @@ ActiveRecord::Schema.define(:version => 20111220190817) do
     t.integer  "project_access", :default => 0, :null => false
   end
 
+  create_table "web_hook_urls", :force => true do |t|
+    t.string   "url"
+    t.integer  "project_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  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