diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-05-16 20:30:42 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-05-16 20:30:42 +0000 |
| commit | 4f667997386a4443b62261c4ee63668936b1d24f (patch) | |
| tree | a3fefe461193468f25e983846d1c1ef4d7bd1d06 /spec/models | |
| parent | 1c86e804ed371b6d1d3c02056396ff03af846df1 (diff) | |
| parent | e5c97101478829fe8200557afd02bde92c3eb4e4 (diff) | |
| download | gitlab-ce-4f667997386a4443b62261c4ee63668936b1d24f.tar.gz | |
Merge branch 'wiki-fix-reloaded' into 'master'
Use the relative url prefix for links in Wiki
Retry of gitlab-org/gitlab-ce!4026
@rymai !4050 solved all other problems how it looks like. I [tested](https://gitlab.com/artem-forks/gitlab-ce/commit/ff01eca7b559efa7cacf3412aa01cd8ae8a6db7e/builds) this with ruby22
Fixes #17071
See merge request !4131
Diffstat (limited to 'spec/models')
| -rw-r--r-- | spec/models/project_wiki_spec.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/models/project_wiki_spec.rb b/spec/models/project_wiki_spec.rb index 532e3f013fd..91ebb612baa 100644 --- a/spec/models/project_wiki_spec.rb +++ b/spec/models/project_wiki_spec.rb @@ -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 |