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:
Valery Sizov 2011-12-27 23:21:26 +02:00
commit 66fb3909a5
18 changed files with 377 additions and 3 deletions

View file

@ -1,5 +1,8 @@
Gitlab::Application.routes.draw do
# Optionally, enable Resque here
# require 'resque/server'
# mount Resque::Server.new, at: '/info/resque'
get 'tags'=> 'tags#index'
get 'tags/:tag' => 'projects#index'