Merged r1505, r1506, r1511, r1512, r1517, r1518, r1524 to 1526 from trunk.
git-svn-id: http://redmine.rubyforge.org/svn/branches/0.7-stable@1532 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
1 parent
9c5ec2974d
commit
2af910e8e6
9 files changed
+18
-8
No files matched your search
@@ -36,7 +36,7 @@
|
||||
<%= render :partial => 'layouts/project_selector' if User.current.memberships.any? %>
|
||||
</div>
|
||||
|
||||
<h1><%= h(@project ? @project.name : Setting.app_title) %></h1>
|
||||
<h1><%= h(@project && !@project.new_record? ? @project.name : Setting.app_title) %></h1>
|
||||
|
||||
<div id="main-menu">
|
||||
<%= render_main_menu(@project) %>
|
||||
|
||||
@@ -26,7 +26,7 @@ end %>
|
||||
<td class="revision"><%= link_to(format_revision(entry.lastrev.name), :action => 'revision', :id => @project, :rev => entry.lastrev.identifier) if entry.lastrev && entry.lastrev.identifier %></td>
|
||||
<td class="age"><%= distance_of_time_in_words(entry.lastrev.time, Time.now) if entry.lastrev && entry.lastrev.time %></td>
|
||||
<td class="author"><%=h(entry.lastrev.author.to_s.split('<').first) if entry.lastrev %></td>
|
||||
<% changeset = @project.repository.changesets.find_by_revision(entry.lastrev.identifier) if entry.lastrev %>
|
||||
<% changeset = @project.repository.changesets.find_by_revision(entry.lastrev.identifier) if entry.lastrev && entry.lastrev.identifier %>
|
||||
<td class="comments"><%=h truncate(changeset.comments, 50) unless changeset.nil? %></td>
|
||||
</tr>
|
||||
<% end %>
|
||||
@@ -13,6 +13,7 @@
|
||||
<%= "(#{number_to_human_size(@entry.size)})" if @entry.size %>
|
||||
</p>
|
||||
|
||||
<%= render :partial => 'revisions', :locals => {:project => @project, :path => @path, :revisions => @changesets, :entry => @entry }%>
|
||||
<%= render(:partial => 'revisions',
|
||||
:locals => {:project => @project, :path => @path, :revisions => @changesets, :entry => @entry }) unless @changesets.empty? %>
|
||||
|
||||
<% html_title(l(:label_change_plural)) -%>
|
||||
Reference in new issue
Block a user