kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'shortcuts-help' into 'master'

Browse source 
Fix help keyboard shortcut for relative URL setups

Fixes gitlab-org/gitlab-ce#12751

See merge request !3016
This commit is contained in:
Rémy Coutable 2016-03-02 09:13:19 +00:00
commit 1217b5b489
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG
View file

@ -14,6 +14,7 @@ v 8.5.2
- Fix sidebar overlapping content when screen width was below 1200px - Fix sidebar overlapping content when screen width was below 1200px
- Fix error 500 when commenting on a commit - Fix error 500 when commenting on a commit
- Fix broken icons on installations with relative URL (Artem Sidorenko) - Fix broken icons on installations with relative URL (Artem Sidorenko)
- Fix help keyboard shortcut on relative URL setups (Artem Sidorenko)
v 8.5.1 v 8.5.1
- Fix group projects styles - Fix group projects styles

4
app/assets/javascripts/shortcuts.js.coffee
View file

@ -13,8 +13,10 @@ class @Shortcuts
if $('#modal-shortcuts').length > 0 if $('#modal-shortcuts').length > 0
$('#modal-shortcuts').modal('show') $('#modal-shortcuts').modal('show')
else else
url = '/help/shortcuts'
url = gon.relative_url_root + url if gon.relative_url_root?
$.ajax( $.ajax(
url: '/help/shortcuts', url: url,
dataType: 'script', dataType: 'script',
success: (e) -> success: (e) ->
if location and location.length > 0 if location and location.length > 0