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,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'
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue