diff options
author | Rémy Coutable <remy@rymai.me> | 2017-03-20 12:56:43 +0300 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2017-03-20 18:24:01 +0300 |
commit | be25bbc4d2c7e3d5cf3da6f51cb7f7355295ef52 (patch) | |
tree | 4f89c264978be7e93ea7a189e8dbbdca3439babe /app/models/project_wiki.rb | |
parent | cd3e410110a5c6f33c5e873f8fb54883a8e11754 (diff) |
Fix ProjectWiki#http_url_to_repo signature
New Gitlab::UrlSanitizer.http_credentials_for_user method responsible
for generating a credentials hash from a user.
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'app/models/project_wiki.rb')
-rw-r--r-- | app/models/project_wiki.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/app/models/project_wiki.rb b/app/models/project_wiki.rb index 539b31780b3..70eef359cdd 100644 --- a/app/models/project_wiki.rb +++ b/app/models/project_wiki.rb @@ -42,8 +42,11 @@ class ProjectWiki url_to_repo end - def http_url_to_repo - [Gitlab.config.gitlab.url, "/", path_with_namespace, ".git"].join('') + 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 end def wiki_base_path |