diff options
| author | Annabel Dunstone <a.dunstone89@gmail.com> | 2016-02-22 20:16:00 -0600 |
|---|---|---|
| committer | Annabel Dunstone <a.dunstone89@gmail.com> | 2016-02-22 20:16:00 -0600 |
| commit | 7bb378b33d1f02cbb9b09f0987d1d01cd6316671 (patch) | |
| tree | 48bd53eeae868c873092725d53387b90e5117ddd | |
| parent | b80df0873524825a3dedc9d35427941db94c8ab7 (diff) | |
| download | gitlab-ce-7bb378b33d1f02cbb9b09f0987d1d01cd6316671.tar.gz | |
Create EmojisController
| -rw-r--r-- | app/assets/javascripts/awards_handler.coffee | 2 | ||||
| -rw-r--r-- | app/controllers/autocomplete_controller.rb | 4 | ||||
| -rw-r--r-- | app/controllers/emojis_controller.rb | 5 | ||||
| -rw-r--r-- | app/views/emojis/index.html.haml (renamed from app/views/shared/emoji_menu.html.haml) | 0 | ||||
| -rw-r--r-- | config/routes.rb | 3 |
5 files changed, 8 insertions, 6 deletions
diff --git a/app/assets/javascripts/awards_handler.coffee b/app/assets/javascripts/awards_handler.coffee index 8e0e64b8949..8f89d3e61a2 100644 --- a/app/assets/javascripts/awards_handler.coffee +++ b/app/assets/javascripts/awards_handler.coffee @@ -19,7 +19,7 @@ class @AwardsHandler $(".emoji-menu").show() $("#emoji_search").focus() else - $.get "/emoji_menu", (response) -> + $.get "/emojis", (response) -> $(".add-award").after response $(".emoji-menu").show() $("#emoji_search").focus() diff --git a/app/controllers/autocomplete_controller.rb b/app/controllers/autocomplete_controller.rb index f1f61f0dad9..77c8dafc012 100644 --- a/app/controllers/autocomplete_controller.rb +++ b/app/controllers/autocomplete_controller.rb @@ -24,10 +24,6 @@ class AutocompleteController < ApplicationController render json: @user, only: [:name, :username, :id], methods: [:avatar_url] end - def emoji_menu - render 'shared/emoji_menu', layout: false - end - private def find_users diff --git a/app/controllers/emojis_controller.rb b/app/controllers/emojis_controller.rb new file mode 100644 index 00000000000..693e2cc4822 --- /dev/null +++ b/app/controllers/emojis_controller.rb @@ -0,0 +1,5 @@ +class EmojisController < ApplicationController + def index + render :index, layout: false + end +end diff --git a/app/views/shared/emoji_menu.html.haml b/app/views/emojis/index.html.haml index b66e513e4d2..b66e513e4d2 100644 --- a/app/views/shared/emoji_menu.html.haml +++ b/app/views/emojis/index.html.haml diff --git a/config/routes.rb b/config/routes.rb index 78d39338bf2..e50f2bc5dee 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -42,8 +42,9 @@ Rails.application.routes.draw do # Autocomplete get '/autocomplete/users' => 'autocomplete#users' get '/autocomplete/users/:id' => 'autocomplete#user' - get '/emoji_menu' => 'autocomplete#emoji_menu' + # Emojis + resources :emojis, only: :index # Search get 'search' => 'search#show' |