<% # encoding: utf-8 #-- # Copyright (C) 2012 Gitorious AS # Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies) # Copyright (C) 2009 Fabio Akita # Copyright (C) 2009 Sven Eckelmann # Copyright (C) 2008 Tor Arne Vestbø # Copyright (C) 2008 Johan Sørensen # # 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) -%> <% @page_title = "Merge request ##{@merge_request.to_param}: #{h(@merge_request.summary)}" -%>
    <%- if @merge_request.user == current_user -%>
  • <%= button_to t('views.merges.edit_btn'), [:edit, @merge_request.source_repository.project, @merge_request.target_repository, @merge_request], :method => :get %>
  • <%= button_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 -%>
  • <%= favorite_button(@merge_request) %>

<%= t("views.merges.show_title", :id => h(@merge_request.to_param), :summary => h(@merge_request.summary)) -%>

<%= simple_format(auto_link(h(@merge_request.proposal), :urls)) -%>
  • Requested by: <%= link_to(avatar(@merge_request.user, { :size => 16 }), user_path(@merge_request.user)) %> <%= link_to(h(@merge_request.user.title), @merge_request.user) -%>
  • Status: <%= colorized_status(@merge_request.status_tag) -%>
  • Source repository: <%= link_to h(@merge_request.source_name), [@merge_request.source_repository.project, @merge_request.source_repository] -%>
  • Target repository: <%= link_to h(@merge_request.target_name), [@merge_request.source_repository.project, @merge_request.target_repository] -%>
  • Created at: <%= long_ordinal(@merge_request.created_at) %>
<%= render_if_ready(@merge_request, {:include_refresh_link => true}) do -%>

<%= t("views.merges.commits_to_merged") %>:

Version <%= @merge_request.versions.last.version -%>
    <% @merge_request.versions.each do |version| -%>
  • Version <%=h version.version %>
    • <% end -%>
<% if !@git_timeout_occured %> <%= render :partial => "version", :locals => {:version => @merge_request.versions.last} -%> <% end %>

Comments

<%= render :partial => @merge_request.cascaded_comments -%>
<%= render :partial => "comments/form", :locals => { :parent => @merge_request } -%> <% if logged_in? && @merge_request.user == current_user %> <%= help_box(:right) do %>

<%= link_to_function("How to update your merge request", "$('#detailed_merge_request_update_help').toggle()", :class => "more_info") -%>

<% end %> <% end %> <%= help_box(:right) do %>

<%= link_to_function("How to apply this merge request to your repository", "$('#detailed_merge_request_integration_help').toggle()", :class => "more_info") -%>

<% end %> <% end -%>