summaryrefslogtreecommitdiff
path: root/app/helpers
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-02-27 12:21:04 +0000
committerRémy Coutable <remy@rymai.me>2017-02-27 12:21:04 +0000
commitc425f366bfa84efab92b5d5e1d0721f16a2890bc (patch)
treecf15b4a5fdaa7959e81239e8202c7333eaa3f757 /app/helpers
parent82f6c0f5ac4ed29390ed90592d2c431f3494d93f (diff)
parent150c3637521653a9e1200483376e4661ea2a46b3 (diff)
downloadgitlab-ce-c425f366bfa84efab92b5d5e1d0721f16a2890bc.tar.gz
Merge branch '1937-https-clone-url-username' into 'master'
Add the username of the current user to the HTTP(S) clone URL Closes #1937 See merge request !9347
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/button_helper.rb2
-rw-r--r--app/helpers/projects_helper.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/button_helper.rb b/app/helpers/button_helper.rb
index 4c7c16d694c..195094730aa 100644
--- a/app/helpers/button_helper.rb
+++ b/app/helpers/button_helper.rb
@@ -34,7 +34,7 @@ module ButtonHelper
content_tag (append_link ? :a : :span), protocol,
class: klass,
- href: (project.http_url_to_repo if append_link),
+ href: (project.http_url_to_repo(current_user) if append_link),
data: {
html: true,
placement: placement,
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index 735a355c25a..4befeacc135 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -241,7 +241,7 @@ module ProjectsHelper
when 'ssh'
project.ssh_url_to_repo
else
- project.http_url_to_repo
+ project.http_url_to_repo(current_user)
end
end