diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-06-08 18:48:20 +0300 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-06-08 18:48:20 +0300 |
| commit | 329f6cb9b4ef2a7d0063f7c192f87f6f296d8a84 (patch) | |
| tree | 2172dac70d554559bed5d02f5bf967bbb87adea5 /app/assets/javascripts/lib | |
| parent | 4f5ee68f09672d08a4e3997a771e062f56665dab (diff) | |
| parent | 53498e42868f258a5e0cda7894fa4de8e8d4f8e9 (diff) | |
| download | gitlab-ce-329f6cb9b4ef2a7d0063f7c192f87f6f296d8a84.tar.gz | |
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, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/lib/emoji_aliases.js.coffee.erb b/app/assets/javascripts/lib/emoji_aliases.js.coffee.erb index 97be65116e2..80f9936b9c2 100644 --- a/app/assets/javascripts/lib/emoji_aliases.js.coffee.erb +++ b/app/assets/javascripts/lib/emoji_aliases.js.coffee.erb @@ -1,2 +1,2 @@ -window.emojiAliases = -> +gl.emojiAliases = -> JSON.parse('<%= Gitlab::AwardEmoji.aliases.to_json %>') |