diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-03-02 12:13:19 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-03-02 12:46:52 +0300 |
| commit | 1c3d8aaeef230d211fd3fae492690aba6578fa34 (patch) | |
| tree | 9396c7e3e0dc5eeb6d191153b02789c5d6afc052 | |
| parent | 58e247d83bd7dd94ab0934a9196b427748e5603c (diff) | |
Merge branch 'shortcuts-help' into 'master'
Fix help keyboard shortcut for relative URL setups
Fixes gitlab-org/gitlab-ce#12751
See merge request !3016
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/shortcuts.js.coffee | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 915566d5af8..97e6689e78a 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 f141fb69c3e..9c7c2474aa4 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 |