fixes modal for showing shortcuts

618726ff · tiagonbotelho · 017ae313 · 618726ff · 618726ff
--- 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()

--- 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"