diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-02-24 02:50:45 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-02-24 02:50:45 +0000 |
| commit | dba47f680d1716a0e5d96809522301ed3400e396 (patch) | |
| tree | 0105e9cba593d3196e94831d4179226355e7c4fc /config | |
| parent | 9f80118e05e68743d95a83742a1d0a06bba3039c (diff) | |
| parent | 476a8049691951c4e1259cdbb164bbf1fca2bd1e (diff) | |
| download | gitlab-ce-dba47f680d1716a0e5d96809522301ed3400e396.tar.gz | |
Merge branch 'issue_13301_emoji-menu' into 'master'
Load award emoji picker with ajax request
Fixes #13301.
See merge request !2888
Diffstat (limited to 'config')
| -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 30681356c5f..1485b64da19 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -43,6 +43,8 @@ Rails.application.routes.draw do get '/autocomplete/users' => 'autocomplete#users' get '/autocomplete/users/:id' => 'autocomplete#user' + # Emojis + resources :emojis, only: :index # Search get 'search' => 'search#show' |