From 8be19db9d4e62842e17f7b71e83447f680fb2103 Mon Sep 17 00:00:00 2001
From: Artem Sidorenko <artem@posteo.de>
Date: Mon, 29 Feb 2016 09:11:00 +0100
Subject: [PATCH] Fix help keyboard shortcut for relative URL setups

---
 CHANGELOG                                  | 1 +
 app/assets/javascripts/shortcuts.js.coffee | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 4dc38117eb..4730b92c64 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -13,6 +13,7 @@ v 8.5.2
   - Fix sidebar overlapping content when screen width was below 1200px
   - Fix error 500 when commenting on a commit
   - Fix broken icons on installations with relative URL (Artem Sidorenko)
+  - Fix help keyboard shortcut on relative URL setups (Artem Sidorenko)
 
 v 8.5.1
   - Fix group projects styles
diff --git a/app/assets/javascripts/shortcuts.js.coffee b/app/assets/javascripts/shortcuts.js.coffee
index f141fb69c3..9c7c2474aa 100644
--- a/app/assets/javascripts/shortcuts.js.coffee
+++ b/app/assets/javascripts/shortcuts.js.coffee
@@ -13,8 +13,10 @@ class @Shortcuts
     if $('#modal-shortcuts').length > 0
       $('#modal-shortcuts').modal('show')
     else
+      url = '/help/shortcuts'
+      url = gon.relative_url_root + url if gon.relative_url_root?
       $.ajax(
-        url: '/help/shortcuts',
+        url: url,
         dataType: 'script',
         success: (e) ->
           if location and location.length > 0