BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
1217b5b4
Commit
1217b5b4
authored
Mar 02, 2016
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Plain 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
parents
5b0cada7
8be19db9
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
1 deletion
+4
-1
CHANGELOG
CHANGELOG
+1
-0
shortcuts.js.coffee
app/assets/javascripts/shortcuts.js.coffee
+3
-1
No files found.
CHANGELOG
View file @
1217b5b4
...
...
@@ -14,6 +14,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
...
...
app/assets/javascripts/shortcuts.js.coffee
View file @
1217b5b4
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment