summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/lib
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2016-06-04 00:16:13 +0300
committerZ.J. van de Weg <zegerjan@gitlab.com>2016-06-06 16:02:11 +0200
commit8dc1fa0d8dc9106ab95a3039723e9013c4eed00c (patch)
treef41a60d994219e7c915428b1e3cd44a9843a8781 /app/assets/javascripts/lib
parent7d3f8f542f0fe02ae27d5f527d578c19f47eec71 (diff)
downloadgitlab-ce-8dc1fa0d8dc9106ab95a3039723e9013c4eed00c.tar.gz
Updated MR notes.notes-are-awardables
Diffstat (limited to 'app/assets/javascripts/lib')
-rw-r--r--app/assets/javascripts/lib/emoji_aliases.js.coffee.erb2
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 %>')