summaryrefslogtreecommitdiff
path: root/spec/models/project_wiki_spec.rb
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-05-10 10:56:58 +0200
committerRémy Coutable <remy@rymai.me>2016-05-10 10:57:48 +0200
commitf52a15e022fb451fa9074495897cdd10dbeeceb3 (patch)
tree0fa663a7c2a93fb129cf55fd069e6f7e20bf82e1 /spec/models/project_wiki_spec.rb
parent3dc64764ad4c004f1b72aa4e80f0095e7a9a6571 (diff)
downloadgitlab-ce-f52a15e022fb451fa9074495897cdd10dbeeceb3.tar.gz
Revert "Merge branch 'wiki-fix' into 'master' "
This reverts commit 4cc85a58e8ca00f5a4ecbd2bca40a0cad867b817, reversing changes made to 90ae445ba930068d04adc5a009dbdeabe4cb3e34. Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'spec/models/project_wiki_spec.rb')
-rw-r--r--spec/models/project_wiki_spec.rb4
1 files changed, 1 insertions, 3 deletions
diff --git a/spec/models/project_wiki_spec.rb b/spec/models/project_wiki_spec.rb
index ea659f417f2..532e3f013fd 100644
--- a/spec/models/project_wiki_spec.rb
+++ b/spec/models/project_wiki_spec.rb
@@ -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