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

This commit is contained in:
huang 2017-03-24 12:34:16 +08:00
commit 9e5ba45b5c
2 changed files with 1 additions and 1 deletions

View File

@ -18,6 +18,7 @@ class GamesController < ApplicationController
# mushixun的版本库必须创建时就创建
def show
@rev = @rev.nil? ? "master" : @rev
@git_url = git_repository_url(@myshixun, "Myshixun")
@entries = @repository.entries(@path, @rev)
@latest_output = @game.latest_output.try(:out_put)

View File

@ -7,7 +7,6 @@
<% sub_path = entry.path[0] == "/" ? entry.path.sub("/", "") : entry.path %>
<% ent_path = Redmine::CodesetUtil.replace_invalid_utf8(sub_path) %>
<% ent_name = Redmine::CodesetUtil.replace_invalid_utf8(entry.name) %>
<tr id="<%= tr_id %>" class="<%= h params[:parent_id] %> entry <%= entry.kind %>">
<td class="filename_no_report hidden">
<%= link_to h(ent_name),