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 /app/controllers | |
| 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 'app/controllers')
| -rw-r--r-- | app/controllers/emojis_controller.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/app/controllers/emojis_controller.rb b/app/controllers/emojis_controller.rb new file mode 100644 index 00000000000..1bec5a7d27f --- /dev/null +++ b/app/controllers/emojis_controller.rb @@ -0,0 +1,6 @@ +class EmojisController < ApplicationController + layout false + + def index + end +end |