diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-01-14 23:26:35 +0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-01-14 23:26:35 +0400 |
| commit | cbd78922ee43c0124458e2867071f752cae712f4 (patch) | |
| tree | 5367dd4e0370f11bc5733de364016f2572a3323f /config/routes.rb | |
| parent | 09b877ef29a0c641457eb986c5b228d003c51c16 (diff) | |
| parent | dda6b0ab63eb8080e34b4273cfb6aadb7a29c028 (diff) | |
Merge branch 'deploy_keys'
Conflicts:
app/views/layouts/project.html.haml
db/schema.rb
Diffstat (limited to 'config/routes.rb')
| -rw-r--r-- | config/routes.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/routes.rb b/config/routes.rb index 9d1e7089209..3a4018d5cff 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -53,6 +53,8 @@ Gitlab::Application.routes.draw do end end + resources :deploy_keys + resources :refs, :only => [], :path => "/" do collection do get "switch" |