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/dispatcher.js.coffee | |
| 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/dispatcher.js.coffee')
| -rw-r--r-- | app/assets/javascripts/dispatcher.js.coffee | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/assets/javascripts/dispatcher.js.coffee b/app/assets/javascripts/dispatcher.js.coffee index f91aa3c5ad7..ff8bcf89918 100644 --- a/app/assets/javascripts/dispatcher.js.coffee +++ b/app/assets/javascripts/dispatcher.js.coffee @@ -23,6 +23,7 @@ class Dispatcher new Issue() shortcut_handler = new ShortcutsIssuable() new ZenMode() + window.awards_handler = new AwardsHandler() when 'projects:milestones:show', 'groups:milestones:show', 'dashboard:milestones:show' new Milestone() when 'dashboard:todos:index' @@ -53,6 +54,7 @@ class Dispatcher new Diff() shortcut_handler = new ShortcutsIssuable(true) new ZenMode() + window.awards_handler = new AwardsHandler() when "projects:merge_requests:diffs" new Diff() new ZenMode() |