diff options
| author | Ariejan de Vroom <ariejan@ariejan.net> | 2012-03-01 16:00:14 +0100 |
|---|---|---|
| committer | Ariejan de Vroom <ariejan@ariejan.net> | 2012-03-01 16:00:14 +0100 |
| commit | b0ce61c4f20abe1ca5c99631517b49c99f8b23ef (patch) | |
| tree | f43439eba70d0815da2528d8110c456440a3ff12 /db/schema.rb | |
| parent | bfe0906f2ff7a79064c1866c0278cd0c9440b246 (diff) | |
| parent | f5a16663f0b038aeb397bda19ebdefa6ad873955 (diff) | |
| download | gitlab-ce-b0ce61c4f20abe1ca5c99631517b49c99f8b23ef.tar.gz | |
Merge branch 'deploy_keys_nonunique' of https://github.com/miks/gitlabhq into miks-deploy_keys_nonunique
Added/fixed specs
Update spec/factory to allow Factory#new without opts
Conflicts:
app/models/key.rb
Diffstat (limited to 'db/schema.rb')
| -rw-r--r-- | db/schema.rb | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/db/schema.rb b/db/schema.rb index a0baf8e2d67..c5e14a69542 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -163,6 +163,13 @@ ActiveRecord::Schema.define(:version => 20120228134252) 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" |