diff options
| author | tiagonbotelho <tiagonbotelho@hotmail.com> | 2016-07-18 19:06:43 +0100 |
|---|---|---|
| committer | tiagonbotelho <tiagonbotelho@hotmail.com> | 2016-07-18 19:06:43 +0100 |
| commit | 618726ff19e90787d7c1f94c2b9bb081573bc901 (patch) | |
| tree | f96ba47b464776897de0b723d07af85b50863436 | |
| parent | 017ae313dc84682e260e960f93fb4a55af0df523 (diff) | |
| download | gitlab-ce-help-shortcuts-fix.tar.gz | |
fixes modal for showing shortcutshelp-shortcuts-fix
| -rw-r--r-- | app/assets/javascripts/shortcuts.js.coffee | 11 | ||||
| -rw-r--r-- | app/views/help/index.html.haml | 2 |
2 files changed, 2 insertions, 11 deletions
diff --git a/app/assets/javascripts/shortcuts.js.coffee b/app/assets/javascripts/shortcuts.js.coffee index 8c8689bacee..07aa5b6652e 100644 --- a/app/assets/javascripts/shortcuts.js.coffee +++ b/app/assets/javascripts/shortcuts.js.coffee @@ -22,17 +22,6 @@ class @Shortcuts $modal.modal('toggle') return - $.ajax( - url: gon.shortcuts_path, - dataType: 'script', - success: (e) -> - if location and location.length > 0 - $(l).show() for l in location - else - $('.hidden-shortcut').show() - $('.js-more-help-button').remove() - ) - focusFilter: (e) -> @filterInput ?= $('input[type=search]', '.nav-controls') @filterInput.focus() diff --git a/app/views/help/index.html.haml b/app/views/help/index.html.haml index 57601ae9be0..6dddf656e02 100644 --- a/app/views/help/index.html.haml +++ b/app/views/help/index.html.haml @@ -39,3 +39,5 @@ %li= link_to 'Use shortcuts', '#', onclick: 'Shortcuts.toggleHelp()' %li= link_to 'Get a support subscription', 'https://about.gitlab.com/pricing/' %li= link_to 'Compare GitLab editions', 'https://about.gitlab.com/features/#compare' + += render "help/shortcuts" |