<% #-- # 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 . #++ %> <% if @commit -%>
  • <%= avatar_from_email(@commit.committer.email, { :size => 32 }) %>
  • <%=h @commit.committer.name -%> <%= render_email(@commit.committer.email) -%> <% if @commit.committer != @commit.author -%> (<%= t("views.commits.committer") %>) <% end -%>
  • <%= time_ago(@commit.committed_date) -%>
    • <% if @commit.committer != @commit.author -%>
  • <%= avatar_from_email(@commit.author.email, { :size => 32 }) %>
  • <%=h @commit.author.name -%> <%= render_email(@commit.author.email) -%> (<%= t("views.commits.author") %>)
  • <%= time_ago(@commit.authored_date) -%>
    • <% end -%> 
<%= h(@commit.message) -%>
<% end -%> <%= render :partial => "comments/inline_comment_form", :locals => { :commentable_type => "merge_request_version", :comment => @version.comments.build, :url => repo_owner_path(@version.merge_request.target_repository, [ @version.merge_request.target_repository.project, @version.merge_request.target_repository, @version.merge_request, @version, :comments]), :sha1 => nil, :include_favorite_checkbox => !@version.merge_request.watched_by?(current_user) } -%> <%= render_inline_diffs_controls("merge-requests") %> <%= render_inline_diffs_with_stats(diffs){|file|@version.comments_for_path_and_sha(file.a_path, @sha_range)} -%>