diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-05-16 23:30:42 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-05-16 23:30:42 +0300 |
| commit | 4f667997386a4443b62261c4ee63668936b1d24f (patch) | |
| tree | a3fefe461193468f25e983846d1c1ef4d7bd1d06 /lib/gitlab | |
| parent | 1c86e804ed371b6d1d3c02056396ff03af846df1 (diff) | |
| parent | e5c97101478829fe8200557afd02bde92c3eb4e4 (diff) | |
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 'lib/gitlab')
| -rw-r--r-- | lib/gitlab/url_builder.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/url_builder.rb b/lib/gitlab/url_builder.rb index 2bbbd3074e8..fe65c246101 100644 --- a/lib/gitlab/url_builder.rb +++ b/lib/gitlab/url_builder.rb @@ -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 |