| 1 |
<h1> |
| 2 |
Reviewing merge request "<%=h @merge_request.source_repository.name -%>" → |
| 3 |
"<%= @merge_request.target_repository.name -%>" |
| 4 |
</h1> |
| 5 |
|
| 6 |
<%= render :partial => @merge_request, :locals => { :no_link => true } -%> |
| 7 |
|
| 8 |
<% if @merge_request.resolvable_by?(current_user) -%> |
| 9 |
<% form_for @merge_request, |
| 10 |
:url => resolve_project_repository_merge_request_path(@project, |
| 11 |
@repository, @merge_request) do |f| -%> |
| 12 |
<p> |
| 13 |
<%= f.label :status -%><br /> |
| 14 |
<%= f.select :status, MergeRequest.statuses.sort_by{|k,v| v } -%><br /> |
| 15 |
<%= f.submit "Update merge request" -%></p> |
| 16 |
<% end -%> |
| 17 |
|
| 18 |
<% if @merge_request.open? -%> |
| 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> |
| 21 |
<% end -%> |
| 22 |
<% end -%> |
| 23 |
|
| 24 |
<% if @merge_request.open? -%> |
| 25 |
<h2>Commits that would be merged:</h2> |
| 26 |
|
| 27 |
<ul class="shortlog"> |
| 28 |
<% @commits.each do |commit| -%> |
| 29 |
<li><a href=""><%= link_to h(commit.id_abbrev), |
| 30 |
project_repository_commit_path(@project, @merge_request.source_repository, commit.id) -%></a> |
| 31 |
by <strong><%=h commit.committer.name -%></strong> <%=h time_ago_in_words(commit.committed_date) -%> ago |
| 32 |
<div class="commit_message"><%= simple_format(h(commit.message)) -%></div></li> |
| 33 |
<% end -%> |
| 34 |
</ul> |
| 35 |
<% end -%> |
| 36 |
|
| 37 |
<% content_for :submenu do -%> |
| 38 |
<%= render :partial => "repositories/context_menu" -%> |
| 39 |
<% end -%> |
