<%
# encoding: utf-8
#--
# Copyright (C) 2012 Gitorious AS
# Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies)
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see .
#++
%>
<%= breadcrumbs_from(@merge_request) -%>
<%= t("views.merges.show_title", :id => h(@merge_request.id), :summary => h(@merge_request.summary)) -%>
<%= render :partial => @merge_request, :locals => { :no_link => true } -%>
<% if !@merge_request.open? -%>
<%= @merge_request.status_string.titlecase -%>:
<%= simple_format(auto_link(h(@merge_request.reason), :urls)) -%>
<% end -%>
<% if logged_in? && can_resolve_merge_request?(current_user, @merge_request) && !@merge_request.possible_next_states.blank? -%>
<% if @merge_request.open? -%>
<%= help_box(:left) do -%>
<%= t("views.merges.help") %>
<%= link_to_function(t("views.merges.example"),
"$('#detailed_merge_request_help').toggle()", :class => "more_info") -%>
git checkout master
git remote add <%= @merge_request.source_repository.user.login -%> <%= @merge_request.source_repository.clone_url %>
git fetch <%= @merge_request.source_repository.user.login %>
git checkout -b <%= @merge_request.source_repository.user.login -%>-review <%= @merge_request.source_repository.user.login -%>/<%= @merge_request.source_branch || 'master' %>
<% if @merge_request.applies_to_specific_commits? -%>
git reset --hard <%=h @merge_request.ending_commit -%>
<% end %>
# review changes, assess they are ok
git checkout <%= @merge_request.target_branch || 'master' %>
git merge <%= @merge_request.source_repository.user.login -%>/<%= @merge_request.source_branch || 'master' %>
git push origin <%= @merge_request.target_branch || 'master' -%>
<% end -%>
<% end -%>
<% end -%>
<% if @merge_request.open? -%>
<%= t("views.merges.commits_to_merged") %>:
<% else -%>
<%= t("views.merges.commits") %>:
<% end -%>
<% if @commits.blank? -%>
It appears that the commits in this merge request have already been merged
into <%= link_to(@merge_request.target_repository.name, [@merge_request.target_repository.project, @merge_request.target_repository]) -%>.
<% if !@merge_request.ending_commit.blank? -%>
The ending commit of this merge request was <%=h @merge_request.ending_commit -%>.
<% end -%>
<% else -%>
<%= render :partial => 'commits', :locals => {:skip_headings => true} %>
<% end # if @commits.blank? -%>
<%= content_for(:sidebar) do -%>
<%- if @merge_request.user == current_user -%>
-
<%= link_to t('views.merges.delete_btn'), [@merge_request.source_repository.project,
@merge_request.target_repository,
@merge_request], :method => :delete, :confirm => 'Are you sure you want to delete this merge request?' %>
<%- end -%>
<%- end -%>
<%= render :partial => "comments/form", :locals => { :parent => @merge_request } -%>