diff options
| author | Connor Shea <connor.james.shea@gmail.com> | 2016-05-30 13:04:04 -0600 |
|---|---|---|
| committer | Connor Shea <connor.james.shea@gmail.com> | 2016-06-06 09:00:02 -0600 |
| commit | f385aebeff74a959137dde64f06ee1ef56212de4 (patch) | |
| tree | 116e42f00f3ac0a4d03ec426e6d1fab9f1bc5dcd | |
| parent | b9f59ec39c53c7bb0bf26bf8adcf99afd5177490 (diff) | |
| download | gitlab-ce-autocomplete-perf.tar.gz | |
Fix tests failing.autocomplete-perf
| -rw-r--r-- | app/assets/javascripts/gfm_auto_complete.js.coffee | 7 | ||||
| -rw-r--r-- | app/controllers/emojis_controller.rb | 2 |
2 files changed, 1 insertions, 8 deletions
diff --git a/app/assets/javascripts/gfm_auto_complete.js.coffee b/app/assets/javascripts/gfm_auto_complete.js.coffee index f4170a76913..75b5a71f750 100644 --- a/app/assets/javascripts/gfm_auto_complete.js.coffee +++ b/app/assets/javascripts/gfm_auto_complete.js.coffee @@ -130,14 +130,10 @@ GitLab.GfmAutoCompleteEmoji = setup: (wrap) -> @input = $('.js-gfm-input') - # destroy previous instances - @destroyAtWho() - # set up instances @setupAtWho() if @dataSource - console.log(@dataSource) if !@dataLoading @dataLoading = true @@ -161,9 +157,6 @@ GitLab.GfmAutoCompleteEmoji = displayTpl: @Emoji.template insertTpl: ':${name}:' - destroyAtWho: -> - @input.atwho('destroy') - fetchData: (dataSource) -> $.getJSON(dataSource) diff --git a/app/controllers/emojis_controller.rb b/app/controllers/emojis_controller.rb index 32e41586992..86de74b3fa1 100644 --- a/app/controllers/emojis_controller.rb +++ b/app/controllers/emojis_controller.rb @@ -3,7 +3,7 @@ class EmojisController < ApplicationController def index @emoji = { - emoji: AwardEmoji.urls + emoji: Gitlab::AwardEmoji.urls } respond_to do |format| |