diff options
| author | Valery Sizov <vsv2711@gmail.com> | 2011-12-28 01:21:26 +0400 |
|---|---|---|
| committer | Valery Sizov <vsv2711@gmail.com> | 2011-12-28 01:21:26 +0400 |
| commit | 66fb3909a564d2e7905f5b720fd55ea61286605e (patch) | |
| tree | f84c4d7d378b37ae1c2ec35ae3bedf42dcf393b8 /config/routes.rb | |
| parent | fbf412eaa0ee68812cdbab9e96f194e03fedd334 (diff) | |
| parent | 5ca836048d4f3319d24d2d4580912102eed54618 (diff) | |
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
Diffstat (limited to 'config/routes.rb')
| -rw-r--r-- | config/routes.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/config/routes.rb b/config/routes.rb index 882ba00a6b2..bf9fe95454d 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -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' |