diff options
| author | Phil Hughes <me@iamphill.com> | 2016-03-31 10:55:37 +0100 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-05-19 14:07:27 -0500 |
| commit | 0b45cf55dddb66b7c6328bc6d5233d023c031e5c (patch) | |
| tree | 9f55bf0b91bfcbfa44af03a89896d6abf0477432 /app/assets/javascripts/lib | |
| parent | 4caf38a1d583f1561affc278ff0ddc0174e47b72 (diff) | |
| download | gitlab-ce-0b45cf55dddb66b7c6328bc6d5233d023c031e5c.tar.gz | |
Uses the same emoji-menu and just moves it around depending where it should be viewed
# Conflicts:
# app/assets/javascripts/awards_handler.coffee
# app/assets/stylesheets/pages/notes.scss
# app/helpers/issues_helper.rb
# app/views/projects/notes/_note.html.haml
Diffstat (limited to 'app/assets/javascripts/lib')
| -rw-r--r-- | app/assets/javascripts/lib/emoji_aliases.js.coffee.erb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/assets/javascripts/lib/emoji_aliases.js.coffee.erb b/app/assets/javascripts/lib/emoji_aliases.js.coffee.erb new file mode 100644 index 00000000000..66f640a3cb7 --- /dev/null +++ b/app/assets/javascripts/lib/emoji_aliases.js.coffee.erb @@ -0,0 +1,2 @@ +window.emojiAliases = -> + JSON.parse('<%= AwardEmoji.aliases.to_json %>') |