diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-05-10 11:56:58 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-05-10 11:57:48 +0300 |
| commit | f52a15e022fb451fa9074495897cdd10dbeeceb3 (patch) | |
| tree | 0fa663a7c2a93fb129cf55fd069e6f7e20bf82e1 /spec/lib/gitlab/url_builder_spec.rb | |
| parent | 3dc64764ad4c004f1b72aa4e80f0095e7a9a6571 (diff) | |
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/lib/gitlab/url_builder_spec.rb')
| -rw-r--r-- | spec/lib/gitlab/url_builder_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/lib/gitlab/url_builder_spec.rb b/spec/lib/gitlab/url_builder_spec.rb index c8d3bc01395..bf11472407a 100644 --- a/spec/lib/gitlab/url_builder_spec.rb +++ b/spec/lib/gitlab/url_builder_spec.rb @@ -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 |