diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-06-06 19:00:12 +0300 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-06-06 19:00:12 +0300 |
| commit | a18a58625751611dba4400c574fabfd4a4507a56 (patch) | |
| tree | 663342f70b17e674aee3add0d4b57028d03e8b1a /app/assets/javascripts/lib | |
| parent | 0dba294f99e5ec672b4a8a97b5d51ac79a3efc8b (diff) | |
| parent | ac4e3e8cf016f2c2b3dcf3997673310a5df658a9 (diff) | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into milestone-tooltip
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..97be65116e2 --- /dev/null +++ b/app/assets/javascripts/lib/emoji_aliases.js.coffee.erb @@ -0,0 +1,2 @@ +window.emojiAliases = -> + JSON.parse('<%= Gitlab::AwardEmoji.aliases.to_json %>') |