diff options
| author | Regis <boudinot.regis@yahoo.com> | 2017-03-21 09:08:28 -0600 |
|---|---|---|
| committer | Regis <boudinot.regis@yahoo.com> | 2017-03-21 09:08:28 -0600 |
| commit | 0b75b821c6cfd173291fcfd88c41da9922d082dd (patch) | |
| tree | 41b578d299bd77423aa3591955a4cb5ca07ab025 /app/models/project_wiki.rb | |
| parent | 6342da7bb6cbba1b1e026fc62a1da42b811b25f4 (diff) | |
| parent | a08c707c928092426e2334423e71c6b841309ddf (diff) | |
| download | gitlab-ce-issue-title-vue.tar.gz | |
update to current master and fix conflictsissue-title-vue
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 |