diff options
author | Simon Knox <psimyn@gmail.com> | 2017-09-06 14:35:58 +1000 |
---|---|---|
committer | Simon Knox <psimyn@gmail.com> | 2017-09-06 14:35:58 +1000 |
commit | b9aa55e1ea2ba226bd9bf4c6fb08fdec30e046c5 (patch) | |
tree | b7770180f178086c78ef2ca25d6bb2267f739110 /config/routes.rb | |
parent | 74740604211dab6632771f1bfd7dd67902fea7ef (diff) | |
parent | d68ff7f50a93ebbff537b5e795cf6bf80bd66a6e (diff) | |
download | gitlab-ce-b9aa55e1ea2ba226bd9bf4c6fb08fdec30e046c5.tar.gz |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ee_issue_928_backport
Diffstat (limited to 'config/routes.rb')
-rw-r--r-- | config/routes.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/routes.rb b/config/routes.rb index 5d7166cad9a..5683725c8a2 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -27,6 +27,7 @@ Rails.application.routes.draw do get '/autocomplete/users' => 'autocomplete#users' get '/autocomplete/users/:id' => 'autocomplete#user' get '/autocomplete/projects' => 'autocomplete#projects' + get '/autocomplete/award_emojis' => 'autocomplete#award_emojis' # Search get 'search' => 'search#show' |