summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathieu Schroeter <schroeter@epsitec.ch>2014-05-21 10:37:41 +0200
committerMathieu Schroeter <schroeter@epsitec.ch>2014-05-21 10:37:41 +0200
commitb3b0876e9826820f31d28eaf0e44dc589313eafe (patch)
tree40f7fc1d2d5eaa3c91265b763a16e010c8b8fe34
parentd52a3281dccefa5fcb774b9f0314abba7edfc820 (diff)
downloadgitlab-ce-b3b0876e9826820f31d28eaf0e44dc589313eafe.tar.gz
Add the http(s) command lines in the mails for the new origin when a project was moved in an other namespace.
-rw-r--r--app/views/notify/project_was_moved_email.html.haml6
-rw-r--r--app/views/notify/project_was_moved_email.text.erb4
2 files changed, 8 insertions, 2 deletions
diff --git a/app/views/notify/project_was_moved_email.html.haml b/app/views/notify/project_was_moved_email.html.haml
index 3e761c43435..1667c59bc07 100644
--- a/app/views/notify/project_was_moved_email.html.haml
+++ b/app/views/notify/project_was_moved_email.html.haml
@@ -5,7 +5,11 @@
= link_to project_url(@project) do
= @project.name_with_namespace
%p
- To update the remote url in your local repository run:
+ To update the remote url in your local repository run (for ssh):
%p{ style: "background:#f5f5f5; padding:10px; border:1px solid #ddd" }
git remote set-url origin #{@project.ssh_url_to_repo}
+%p
+ or for http(s):
+%p{ style: "background:#f5f5f5; padding:10px; border:1px solid #ddd" }
+ git remote set-url origin #{@project.http_url_to_repo}
%br
diff --git a/app/views/notify/project_was_moved_email.text.erb b/app/views/notify/project_was_moved_email.text.erb
index 7889c7b9cc4..664148fb3ba 100644
--- a/app/views/notify/project_was_moved_email.text.erb
+++ b/app/views/notify/project_was_moved_email.text.erb
@@ -4,5 +4,7 @@ The project is now located under
<%= project_url(@project) %>
-To update the remote url in your local repository run:
+To update the remote url in your local repository run (for ssh):
git remote set-url origin <%= @project.ssh_url_to_repo %>
+or for http(s):
+ git remote set-url origin <%= @project.http_url_to_repo %>