Merge branch 'mail_template' into 'master'

Mail template changes (add the command line for http) when a project is moved in an other namespace.

See subject, it is just the addition of the set-url for http(s) origin in the mails.

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

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 %>