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

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

Browse source 
Conflicts:
	app/models/project.rb
	config/routes.rb
	db/schema.rb
This commit is contained in:
Valery Sizov 2011-12-27 23:21:26 +02:00
commit 66fb3909a5
18 changed files with 377 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
spec/factories.rb
View file

@ -55,3 +55,7 @@ Factory.add(:key, Key) do |obj|
obj.title = "Example key"
obj.key = File.read(File.join(Rails.root, "db", "pkey.example"))
end
Factory.add(:web_hook, WebHook) do |obj|
obj.url = Faker::Internet.url
end