diff options
author | miks <miks@cubesystems.lv> | 2011-12-29 23:46:21 +0400 |
---|---|---|
committer | miks <miks@cubesystems.lv> | 2011-12-29 23:46:21 +0400 |
commit | f8ad4d2b422af14d57c2c8d49134ef0ef60a1695 (patch) | |
tree | ad4ce74ec0fe976cc8928ebf6550c5dcb621d64d /db | |
parent | 723104c45f83937cd87bee87ac16d3dfc6ce4d88 (diff) | |
parent | 78d882623e13f061349ff6237e250970fc48d8a4 (diff) |
Merge branch 'master' into deploy_keys
Conflicts:
app/models/project.rb
Diffstat (limited to 'db')
-rw-r--r-- | db/migrate/20111214091851_create_web_hooks.rb | 9 | ||||
-rw-r--r-- | db/schema.rb | 19 |
2 files changed, 16 insertions, 12 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..3014579c16f 100644 --- a/db/schema.rb +++ b/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 |