Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2017-06-27 08:54:34 +0300
committerMike Greiling <mike@pixelcog.com>2017-06-27 08:54:34 +0300
commit9d6bbc92c978beeec70bec1f2d4a65791fa3f985 (patch)
tree8755c3f55adcfbe733d04772fe8116f4b9acebc9 /app/assets/javascripts/gfm_auto_complete.js
parent27a1348f20dee09758e053b465a2d2ff37ffb649 (diff)
move glEmojiTag method to emoji helper
Diffstat (limited to 'app/assets/javascripts/gfm_auto_complete.js')
-rw-r--r--app/assets/javascripts/gfm_auto_complete.js3
1 files changed, 1 insertions, 2 deletions
diff --git a/app/assets/javascripts/gfm_auto_complete.js b/app/assets/javascripts/gfm_auto_complete.js
index 9d057fd22a8..f99bac7da1a 100644
--- a/app/assets/javascripts/gfm_auto_complete.js
+++ b/app/assets/javascripts/gfm_auto_complete.js
@@ -1,5 +1,4 @@
-import { glEmojiTag } from './behaviors/gl_emoji';
-import { validEmojiNames } from './emoji';
+import { validEmojiNames, glEmojiTag } from './emoji';
import glRegexp from './lib/utils/regexp';
import AjaxCache from './lib/utils/ajax_cache';