summaryrefslogtreecommitdiff
path: root/app/models/project_wiki.rb
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-05-30 14:18:58 +0200
committerRémy Coutable <remy@rymai.me>2017-05-30 14:18:58 +0200
commitbf4cc9e1f3ca6e4d828eb2bc1ca22d4f350c9dc6 (patch)
tree2c402a7f088b7e0b3d3f7dd1903b8420f5dc7cf3 /app/models/project_wiki.rb
parentfd376b3ed4de310f8e599cbbeb5c18e5a31c188c (diff)
downloadgitlab-ce-bf4cc9e1f3ca6e4d828eb2bc1ca22d4f350c9dc6.tar.gz
Don't allow to pass a user to ProjectWiki#http_url_to_repo
This partially reverts be25bbc4d2c7e3d5cf3da6f51cb7f7355295ef52. Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'app/models/project_wiki.rb')
-rw-r--r--app/models/project_wiki.rb7
1 files changed, 2 insertions, 5 deletions
diff --git a/app/models/project_wiki.rb b/app/models/project_wiki.rb
index 189c106b70b..f38fbda7839 100644
--- a/app/models/project_wiki.rb
+++ b/app/models/project_wiki.rb
@@ -42,11 +42,8 @@ class ProjectWiki
url_to_repo
end
- def http_url_to_repo(user = nil)
- url = "#{Gitlab.config.gitlab.url}/#{path_with_namespace}.git"
- credentials = Gitlab::UrlSanitizer.http_credentials_for_user(user)
-
- Gitlab::UrlSanitizer.new(url, credentials: credentials).full_url
+ def http_url_to_repo
+ "#{Gitlab.config.gitlab.url}/#{path_with_namespace}.git"
end
def wiki_base_path