From 1c3d8aaeef230d211fd3fae492690aba6578fa34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Wed, 2 Mar 2016 09:13:19 +0000
Subject: [PATCH] Merge branch 'shortcuts-help' into 'master'

Fix help keyboard shortcut for relative URL setups

Fixes gitlab-org/gitlab-ce#12751

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

diff --git a/CHANGELOG b/CHANGELOG
index 915566d5af..97e6689e78 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -8,6 +8,7 @@ v 8.5.2
   - Fix broken icons on installations with relative URL (Artem Sidorenko)
   - Improve implementation to check read access to forks and add pagination
   - Don't show any "2FA required" message if it's not actually required
+  - Fix help keyboard shortcut on relative URL setups (Artem Sidorenko)
   - Update Rails to 4.2.5.2
 
 v 8.5.1
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