diff options
| author | miks <miks@cubesystems.lv> | 2011-12-29 23:46:21 +0400 |
|---|---|---|
| committer | miks <miks@cubesystems.lv> | 2011-12-29 23:46:21 +0400 |
| commit | f8ad4d2b422af14d57c2c8d49134ef0ef60a1695 (patch) | |
| tree | ad4ce74ec0fe976cc8928ebf6550c5dcb621d64d /config/routes.rb | |
| parent | 723104c45f83937cd87bee87ac16d3dfc6ce4d88 (diff) | |
| parent | 78d882623e13f061349ff6237e250970fc48d8a4 (diff) | |
Merge branch 'master' into deploy_keys
Conflicts:
app/models/project.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 20890b76c7c..bf5eaf73ca0 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' |