diff options
| author | Connor Shea <connor.james.shea@gmail.com> | 2016-07-19 20:17:14 +0300 |
|---|---|---|
| committer | Connor Shea <connor.james.shea@gmail.com> | 2016-07-19 20:17:14 +0300 |
| commit | 16a8160e9f1cc2874a39dfd2d6a6abea9bcfead5 (patch) | |
| tree | ec308b39932cfaf6bee3c61b0a6cb4ba61833c42 /lib | |
| parent | 81e57e783e8882de21d27d9191c09404ed7faca3 (diff) | |
Fix help page paths to make sure shortcuts and the UI help page work.
Add a test to make sure the help page UI path doesn't break in the future.
Fix #19972 and #19889.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/gon_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/gon_helper.rb b/lib/gitlab/gon_helper.rb index d4f12cb1df9..c5a11148d33 100644 --- a/lib/gitlab/gon_helper.rb +++ b/lib/gitlab/gon_helper.rb @@ -5,7 +5,7 @@ module Gitlab gon.default_avatar_url = URI::join(Gitlab.config.gitlab.url, ActionController::Base.helpers.image_path('no_avatar.png')).to_s gon.max_file_size = current_application_settings.max_attachment_size gon.relative_url_root = Gitlab.config.gitlab.relative_url_root - gon.shortcuts_path = help_shortcuts_path + gon.shortcuts_path = help_page_path('shortcuts') gon.user_color_scheme = Gitlab::ColorSchemes.for_user(current_user).css_class gon.award_menu_url = emojis_path |