Commit 2a70564d70365eab95ca2ba446e4952ef0e07ba3
- Date: Fri May 02 22:51:18 +0000 2008
- Committer: Tim Dysinger (tim@dysinger.net)
- Author: Tim Dysinger (tim@dysinger.net)
- Commit SHA1: 2a70564d70365eab95ca2ba446e4952ef0e07ba3
- Tree SHA1: 6d2517393948498cb3ec8f281ea312d0c832ae03
changed the merge request help to show the push url not the git:// url
Commit diff
| | |
| 17 | 17 | |
| 18 | 18 | <% if @merge_request.open? -%> |
| 19 | 19 | <p>The simplest way to merge in these changes is to simply pull them in with the following command:</p> |
| 20 | | <pre>git pull <%= @merge_request.source_repository.clone_url -%> <%= @merge_request.source_branch -%></pre> |
| 20 | <pre>git pull <%= @merge_request.source_repository.push_url -%> <%= @merge_request.source_branch -%></pre> |
| 21 | 21 | <% end -%> |
| 22 | 22 | <% end -%> |
| 23 | 23 | |
| toggle raw diff |
--- a/app/views/merge_requests/show.html.erb
+++ b/app/views/merge_requests/show.html.erb
@@ -17,7 +17,7 @@
<% if @merge_request.open? -%>
<p>The simplest way to merge in these changes is to simply pull them in with the following command:</p>
- <pre>git pull <%= @merge_request.source_repository.clone_url -%> <%= @merge_request.source_branch -%></pre>
+ <pre>git pull <%= @merge_request.source_repository.push_url -%> <%= @merge_request.source_branch -%></pre>
<% end -%>
<% end -%>
|
