Revert "Merge branch 'wiki-fix' into 'master'

This reverts commit 4cc85a58, reversing
changes made to 90ae445b.
Signed-off-by: 's avatarRémy Coutable <remy@rymai.me>
parent 3dc64764
......@@ -39,7 +39,6 @@ v 8.8.0 (unreleased)
v 8.7.4
- Fix always showing build notification message when switching between merge requests
- Fix links on wiki pages for relative url setups. !4026 (Artem Sidorenko)
- Links for Redmine issue references are generated correctly again (Benedikt Huss)
v 8.7.3
......
......@@ -40,7 +40,7 @@ class ProjectWiki
end
def wiki_base_path
[Gitlab.config.gitlab.url, "/", @project.path_with_namespace, "/wikis"].join('')
["/", @project.path_with_namespace, "/wikis"].join('')
end
# Returns the Gollum::Wiki object.
......
......@@ -62,7 +62,7 @@ module Gitlab
end
def wiki_page_url
"#{object.wiki.wiki_base_path}/#{object.slug}"
"#{Gitlab.config.gitlab.url}#{object.wiki.wiki_base_path}/#{object.slug}"
end
end
end
......@@ -112,7 +112,7 @@ describe Gitlab::UrlBuilder, lib: true do
wiki_page = build(:wiki_page)
url = described_class.build(wiki_page)
expect(url).to eq "#{Gitlab.config.gitlab.url}/#{wiki_page.wiki.project.path_with_namespace}/wikis/#{wiki_page.slug}"
expect(url).to eq "#{Gitlab.config.gitlab.url}#{wiki_page.wiki.wiki_base_path}/#{wiki_page.slug}"
end
end
end
......
......@@ -38,9 +38,7 @@ describe ProjectWiki, models: true do
describe "#wiki_base_path" do
it "returns the wiki base path" do
gitlab_url = Gitlab.config.gitlab.url
wiki_base_path = "#{gitlab_url}/#{project.path_with_namespace}/wikis"
wiki_base_path = "/#{project.path_with_namespace}/wikis"
expect(subject.wiki_base_path).to eq(wiki_base_path)
end
end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment