diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-18 13:34:06 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-18 13:34:06 +0300 |
commit | 859a6fb938bb9ee2a317c46dfa4fcc1af49608f0 (patch) | |
tree | d7f2700abe6b4ffcb2dcfc80631b2d87d0609239 /app/assets/javascripts/pages/profiles/show/index.js | |
parent | 446d496a6d000c73a304be52587cd9bbc7493136 (diff) |
Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42
Diffstat (limited to 'app/assets/javascripts/pages/profiles/show/index.js')
-rw-r--r-- | app/assets/javascripts/pages/profiles/show/index.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/pages/profiles/show/index.js b/app/assets/javascripts/pages/profiles/show/index.js index b78f24ca2fb..a24c6ca7754 100644 --- a/app/assets/javascripts/pages/profiles/show/index.js +++ b/app/assets/javascripts/pages/profiles/show/index.js @@ -1,10 +1,10 @@ +import emojiRegex from 'emoji-regex'; import $ from 'jquery'; import GfmAutoComplete from 'ee_else_ce/gfm_auto_complete'; -import emojiRegex from 'emoji-regex'; +import * as Emoji from '~/emoji'; import { deprecatedCreateFlash as createFlash } from '~/flash'; -import EmojiMenu from './emoji_menu'; import { __ } from '~/locale'; -import * as Emoji from '~/emoji'; +import EmojiMenu from './emoji_menu'; const defaultStatusEmoji = 'speech_balloon'; |