jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject

This commit is contained in:
daiao 2016-11-09 13:34:23 +08:00
parent f6eb96cfdc 018b982f7f
commit 2b164594f6
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/versions/_issue_statistics.html.erb
View File

@ -11,7 +11,7 @@
<tbody>
<% @version_issue_assigned_name.each do | assigned | %>
<tr>
<td><%= User.find(assigned[0]).show_name %></td>
<td><%= User.find(assigned[0]).try(:show_name) %></td>
<td><%= Issue.where(:fixed_version_id => @version.id, :assigned_to_id => assigned[0]).count %></td>
<td><%= Issue.where(:fixed_version_id => @version.id, :assigned_to_id => assigned[0], :status_id => 3).count %></td>
<td><%= Issue.where(:fixed_version_id => @version.id, :assigned_to_id => assigned[0], :status_id => 5).count %></td>

2
config/settings.yml
View File

@ -103,7 +103,7 @@ feeds_limit:
default: 15
gantt_items_limit:
format: int
default: 500
default: 10000
# Maximum size of files that can be displayed
# inline through the file viewer (in KB)
file_max_size_displayed: