Use the relative url prefix for links in Wiki
This commit is contained in:
parent
5e130c3e39
commit
e5c9710147
4 changed files with 7 additions and 3 deletions
|
@ -52,6 +52,9 @@ v 8.8.0 (unreleased)
|
|||
- Hide left sidebar on phone screens to give more space for content
|
||||
- Redesign navigation for profile and group pages
|
||||
|
||||
v 8.7.6
|
||||
- Fix links on wiki pages for relative url setups. !4131 (Artem Sidorenko)
|
||||
|
||||
v 8.7.5
|
||||
- Fix relative links in wiki pages. !4050
|
||||
- Fix always showing build notification message when switching between merge requests !4086
|
||||
|
|
|
@ -40,7 +40,7 @@ class ProjectWiki
|
|||
end
|
||||
|
||||
def wiki_base_path
|
||||
["/", @project.path_with_namespace, "/wikis"].join('')
|
||||
[Gitlab.config.gitlab.relative_url_root, "/", @project.path_with_namespace, "/wikis"].join('')
|
||||
end
|
||||
|
||||
# Returns the Gollum::Wiki object.
|
||||
|
|
|
@ -62,7 +62,7 @@ module Gitlab
|
|||
end
|
||||
|
||||
def wiki_page_url
|
||||
"#{Gitlab.config.gitlab.url}#{object.wiki.wiki_base_path}/#{object.slug}"
|
||||
namespace_project_wiki_url(object.wiki.project.namespace, object.wiki.project, object.slug)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -38,7 +38,8 @@ describe ProjectWiki, models: true do
|
|||
|
||||
describe "#wiki_base_path" do
|
||||
it "returns the wiki base path" do
|
||||
wiki_base_path = "/#{project.path_with_namespace}/wikis"
|
||||
wiki_base_path = "#{Gitlab.config.gitlab.relative_url_root}/#{project.path_with_namespace}/wikis"
|
||||
|
||||
expect(subject.wiki_base_path).to eq(wiki_base_path)
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue