summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-03-27 13:43:46 -0700
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-03-27 13:43:46 -0700
commit4d9b4d358228e4fdd58866366e0184cd3f80388e (patch)
treec31dc49dafc161d98d47793b2ee88010356238cd /config
parent3d4c2d0b510f15ac3f0abe6ba4468dd019b06278 (diff)
parent9007af2c7e37e0147a835af978238b7a53496bf4 (diff)
downloadgitlab-ce-4d9b4d358228e4fdd58866366e0184cd3f80388e.tar.gz
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
Diffstat (limited to 'config')
-rw-r--r--config/routes.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/config/routes.rb b/config/routes.rb
index c30cd768572..388858d2670 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -8,6 +8,11 @@ Gitlab::Application.routes.draw do
authorizations: 'oauth/authorizations'
end
+ # Autocomplete
+ get '/autocomplete/users' => 'autocomplete#users'
+ get '/autocomplete/users/:id' => 'autocomplete#user'
+
+
# Search
get 'search' => 'search#show'
get 'search/autocomplete' => 'search#autocomplete', as: :search_autocomplete