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
This commit is contained in:
commit
66fb3909a5
18 changed files with 377 additions and 3 deletions
1
lib/tasks/resque.rake
Normal file
1
lib/tasks/resque.rake
Normal file
|
@ -0,0 +1 @@
|
|||
require 'resque/tasks'
|
Loading…
Add table
Add a link
Reference in a new issue