Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-05-10 11:56:58 +0300
committerRémy Coutable <remy@rymai.me>2016-05-10 11:57:48 +0300
commitf52a15e022fb451fa9074495897cdd10dbeeceb3 (patch)
tree0fa663a7c2a93fb129cf55fd069e6f7e20bf82e1 /app
parent3dc64764ad4c004f1b72aa4e80f0095e7a9a6571 (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 'app')
-rw-r--r--app/models/project_wiki.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/project_wiki.rb b/app/models/project_wiki.rb
index c91cb70ae25..7c1a61bb0bf 100644
--- a/app/models/project_wiki.rb
+++ b/app/models/project_wiki.rb
@@ -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.