From b3b0876e9826820f31d28eaf0e44dc589313eafe Mon Sep 17 00:00:00 2001
From: Mathieu Schroeter <schroeter@epsitec.ch>
Date: Wed, 21 May 2014 10:37:41 +0200
Subject: Add the http(s) command lines in the mails for the new origin when a
project was moved in an other namespace.
---
app/views/notify/project_was_moved_email.html.haml | 6 +++++-
app/views/notify/project_was_moved_email.text.erb | 4 +++-
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 %>
--
cgit v1.2.1