deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'deploy_keys_nonunique' of https://github.com/miks/gitlabhq into miks-deploy_keys_nonunique

Browse source 
Added/fixed specs
Update spec/factory to allow Factory#new without opts

Conflicts:
	app/models/key.rb
This commit is contained in:
Ariejan de Vroom 2012-03-01 16:00:14 +01:00
commit b0ce61c4f2
4 changed files with 65 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
db/schema.rb
View file

@ -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"