From 200307ec9f4720f6c7d35b48af94fdf29cc7ba1f Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 19 Apr 2016 09:18:58 +0800
Subject: [PATCH 01/10] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E8=AE=BF=E9=97=AE=E7=BB=9F=E8=AE=A1=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/organizations_controller.rb  |  5 ----
 app/views/layouts/base_org.html.erb          |  3 +++
 app/views/layouts/base_org_newstyle.html.erb | 25 ++++++++++++++------
 3 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/app/controllers/organizations_controller.rb b/app/controllers/organizations_controller.rb
index 4fa7659c9..0d99cd8a5 100644
--- a/app/controllers/organizations_controller.rb
+++ b/app/controllers/organizations_controller.rb
@@ -84,9 +84,6 @@ class OrganizationsController < ApplicationController
 
         @subfield_content = @organization.org_subfields.order("priority")
         @organization = Organization.find(params[:id])
-        # 统计访问量
-        @organization.update_column(:visits, @organization.visits.to_i + 1)
-
           # @org_subfield = OrgSubfield.find(params[:org_subfield_id])
           # @org_subfield_ids = @org_subfield.org_document_comments.map(&:id) << 0
           # @org_acts = OrgActivity.where("(org_act_type='OrgDocumentComment'and org_act_id in (#{@org_subfield_ids.join(",")})) || (container_type='OrgSubfield' and container_id=#{@org_subfield.id})").order('updated_at desc').page(params[:page] || 1).per(10)
@@ -123,8 +120,6 @@ class OrganizationsController < ApplicationController
     else
       if @organization.is_public? || User.current.admin? || User.current.member_of_org?(@organization)
         @organization = Organization.find(params[:id])
-        # 统计访问量
-        @organization.update_column(:visits, @organization.visits.to_i + 1)
         if params[:org_subfield_id]
           @org_subfield = OrgSubfield.find(params[:org_subfield_id])
           @org_subfield_ids = @org_subfield.org_document_comments.map(&:id) << 0
diff --git a/app/views/layouts/base_org.html.erb b/app/views/layouts/base_org.html.erb
index faf141600..b2cfa9877 100644
--- a/app/views/layouts/base_org.html.erb
+++ b/app/views/layouts/base_org.html.erb
@@ -113,6 +113,9 @@
         <!--<span class="img_private"><%#= l(:label_private)%></span>-->
         <!--<%# end %>-->
         <!--</div>-->
+        <%# 更新访问数,刷新的时候更新访问次数 %>
+        <%  update_visiti_count @organization %>
+        <%# over %>
 
         <div class="cl"></div>
         <div class="f12 fontGrey3">
diff --git a/app/views/layouts/base_org_newstyle.html.erb b/app/views/layouts/base_org_newstyle.html.erb
index fcbbd8bfe..1fcf60d20 100644
--- a/app/views/layouts/base_org_newstyle.html.erb
+++ b/app/views/layouts/base_org_newstyle.html.erb
@@ -62,9 +62,9 @@
 
 <!--add by huang-->
 <script type="text/javascript">
-    function orge_new_files_upload()
+    function org_new_files_upload()
     {
-        $('#ajax-modal').html('<%= escape_javascript(render :partial => 'files/upload_org_new_files',:locals => {:org => @organization, :org_attachment_type => 1}) %>');
+        $('#ajax-modal').html('<%= escape_javascript(render :partial => 'files/upload_org_new_files',:locals => {:org => @organization, :org_attachment_type => 0}) %>');
         showModal('ajax-modal', '513px');
         $('#ajax-modal').siblings().remove();
         $('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal()' style='margin-left: 480px;'><img src='/images/bid/close.png' width='26px' height='26px' /></a>");
@@ -72,7 +72,7 @@
         $('#ajax-modal').parent().addClass("popbox_polls");
     }
 
-    function orge_new_files_banner_upload()
+    function org_new_files_banner_upload()
     {
         $('#ajax-modal').html('<%= escape_javascript(render :partial => 'files/upload_org_new_files_banner',:locals => {:org => @organization, :org_attachment_type => 1}) %>');
         showModal('ajax-modal', '513px');
@@ -89,12 +89,20 @@
     <div class="header-con">
       <% if User.current.admin_of_org?(@organization) %>
           <div class="logo fl">
-            <a class="logo-img"><img src="/images/org_new_style/logo.jpg" alt=""/></a>
-            <a href="" class="logo-add" title="点击替换LOGO" onclick="orge_new_files_upload();"></a>
+            <% if @org_logo_attchment.blank? %>
+                <a class="logo-img"><img src="/images/org_new_style/logo.jpg" alt=""/></a>
+            <% else %>
+                <img src="/attachments/<%= @org_logo_attchment.id %>/<%= @org_logo_attchment.filename %>" class="logo-img">
+            <% end %>
+            <a href="#" class="logo-add" title="点击替换LOGO" onclick="org_new_files_upload();"></a>
           </div>
        <% else %>
           <div class="logo fl">
-            <a class="logo-img"><img src="/images/org_new_style/logo.jpg" alt=""/></a>
+            <% if @org_logo_attchment.blank? %>
+                <a class="logo-img"><img src="/images/org_new_style/logo.jpg" alt=""/></a>
+            <% else %>
+                <img src="/attachments/<%= @org_logo_attchment.id %>/<%= @org_logo_attchment.filename %>" class="logo-img">
+            <% end %>
           </div>
        <% end %>
       <%= render :partial => 'organizations/org_logined_header' %>
@@ -140,7 +148,7 @@
           <% else %>
               <img src="/attachments/<%= @org_banner_attchment.id %>/<%= @org_banner_attchment.filename %>" class="banner-img">
           <% end %>
-          <a href="#" class="banner-add" title="点击替换图片" onclick="orge_new_files_banner_upload();"></a>
+          <a href="#" class="banner-add" title="点击替换图片" onclick="org_new_files_banner_upload();"></a>
           <div class="banner-txt">
             <p ><%= @organization.name  %></p>
           </div>
@@ -389,6 +397,9 @@
       <% end %>
   <% end %>
 
+  <%# 更新访问数,刷新的时候更新访问次数 %>
+  <%  update_visiti_count @organization %>
+  <%# over %>
 
   <div class="footer">
     <div class="footer-con">

From adc17c50386af85cb389c14ca5b2d91799121152 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 19 Apr 2016 09:34:55 +0800
Subject: [PATCH 02/10] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96=20?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=9B=AE=E5=BD=95=E5=8A=A8=E6=80=81=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E6=8E=A5=E5=8F=A3=20=E6=96=87=E4=BB=B6=E7=9B=AE?=
 =?UTF-8?q?=E5=BD=95=E6=98=BE=E7=A4=BA=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/application_helper.rb             | 28 +++++++++----------
 app/helpers/repositories_helper.rb            | 11 ++++++++
 .../repositories/_dir_list_content.html.erb   | 14 ++++++----
 .../lib/gitlab/client/repositories.rb         | 17 +++++++++++
 public/stylesheets/project.css                |  5 +++-
 5 files changed, 54 insertions(+), 21 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 9572034aa..03bbcad3c 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -123,7 +123,7 @@ module ApplicationHelper
           CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :homework_journal_num => 1)
         else
           score = course_contributor_score.homework_journal_num.to_i + 1
-          course_contributor_score.update_attributes(:homework_journal_num => score)
+          course_contributor_score.update_column(:homework_journal_num, score)
         end
       # 课程留言
       when "Course"
@@ -131,42 +131,42 @@ module ApplicationHelper
           CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :journal_num => 1)
         else
           score = course_contributor_score.journal_num.to_i + 1
-          course_contributor_score.update_attributes(:journal_num => score)
+          course_contributor_score.update_column(:journal_num, score)
         end
       when  "Message"
         if  course_contributor_score.nil?
           CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :message_num => 1)
         else
           score = course_contributor_score.message_num.to_i + 1
-          course_contributor_score.update_attributes(:message_num => score)
+          course_contributor_score.update_column(:message_num, score)
         end
       when "MessageReply"
         if  course_contributor_score.nil?
           CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :message_reply_num => 1)
         else
           score = course_contributor_score.message_reply_num.to_i + 1
-          course_contributor_score.update_attributes(:message_reply_num => score)
+          course_contributor_score.update_column(:message_reply_num, score)
         end
       when "NewReply"
         if  course_contributor_score.nil?
           CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :news_reply_num => 1)
         else
           score = course_contributor_score.news_reply_num.to_i + 1
-          course_contributor_score.update_attributes(:news_reply_num => score)
+          course_contributor_score.update_column(:news_reply_num, score)
         end
       when "News"
         if  course_contributor_score.nil?
           CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :news_num => 1)
         else
           score = course_contributor_score.news_num.to_i + 1
-          course_contributor_score.update_attributes(:news_num => score)
+          course_contributor_score.update_column(:news_num, score)
         end
       when "Attachment"
         if  course_contributor_score.nil?
           CourseContributorScore.create(:course_id => course_id, :user_id => user_id, :resource_num => 1)
         else
           score = course_contributor_score.resource_num.to_i + 1
-          course_contributor_score.update_attributes(:resource_num => score)
+          course_contributor_score.update_column(:resource_num, score)
         end
     end
   end
@@ -178,38 +178,38 @@ module ApplicationHelper
       when "HomeworkCommon"
         unless  course_contributor_score.nil?
           score = course_contributor_score.homework_journal_num.to_i - 1
-          course_contributor_score.update_attribute(:homework_journal_num, score < 0 ? 0 : score)
+          course_contributor_score.update_column(:homework_journal_num, score < 0 ? 0 : score)
         end
       # 课程留言
       when "Course"
         unless  course_contributor_score.nil?
           score = course_contributor_score.journal_num.to_i - 1
-          course_contributor_score.update_attribute(:journal_num, score < 0 ? 0 : score)
+          course_contributor_score.update_column(:journal_num, score < 0 ? 0 : score)
         end
       when  "Message"
         unless  course_contributor_score.nil?
           score = course_contributor_score.message_num.to_i - 1
-          course_contributor_score.update_attribute(:message_num, score < 0 ? 0 : score)
+          course_contributor_score.update_column(:message_num, score < 0 ? 0 : score)
         end
       when "MessageReply"
         unless  course_contributor_score.nil?
           score = course_contributor_score.message_reply_num.to_i - 1
-          course_contributor_score.update_attribute(:message_reply_num, score < 0 ? 0 : score)
+          course_contributor_score.update_column(:message_reply_num, score < 0 ? 0 : score)
         end
       when "NewReply"
         unless  course_contributor_score.nil?
           score = course_contributor_score.news_reply_num.to_i - 1
-          course_contributor_score.update_attribute(:news_reply_num, score < 0 ? 0 : score)
+          course_contributor_score.update_column(:news_reply_num, score < 0 ? 0 : score)
         end
       when "News"
         unless  course_contributor_score.nil?
           score = course_contributor_score.news_num.to_i - 1
-          course_contributor_score.update_attribute(:news_num, score < 0 ? 0 : score)
+          course_contributor_score.update_column(:news_num, score < 0 ? 0 : score)
         end
       when "Attachment"
         unless  course_contributor_score.nil?
           score = course_contributor_score.resource_num.to_i - 1
-          course_contributor_score.update_attribute(:resource_num, score < 0 ? 0 : score)
+          course_contributor_score.update_column(:resource_num, score < 0 ? 0 : score)
         end
     end
   end
diff --git a/app/helpers/repositories_helper.rb b/app/helpers/repositories_helper.rb
index 36187b460..688fd1505 100644
--- a/app/helpers/repositories_helper.rb
+++ b/app/helpers/repositories_helper.rb
@@ -41,6 +41,17 @@ module RepositoriesHelper
     identifiers.include?(iden) ? false :true
   end
 
+  # 获取文件目录的最新动态
+  def get_trees_last_changes(project_id, rev)
+    g = Gitlab.client
+    begin
+      tree_changes = g.rep_last_changes(project_id, :rev => rev)
+      tree_changes
+    rescue
+      logger.error("faile to get tress activities!")
+    end
+  end
+
   # 获取diff内容行号
   def diff_line_num content
     content.scan(/@@ -(\d+),\d+ \+\d+,\d+ @@/).first.join("").to_i
diff --git a/app/views/repositories/_dir_list_content.html.erb b/app/views/repositories/_dir_list_content.html.erb
index dda0cddbd..e82f10689 100644
--- a/app/views/repositories/_dir_list_content.html.erb
+++ b/app/views/repositories/_dir_list_content.html.erb
@@ -3,6 +3,8 @@
    depth = params[:depth].to_i %>
 <%  ent_path = Redmine::CodesetUtil.replace_invalid_utf8(entry.path)   %>
 <%  ent_name = Redmine::CodesetUtil.replace_invalid_utf8(entry.name)   %>
+<% get_trees_last_changes(@project.id, @rev) %>
+
 <tr id="<%= tr_id %>" class="<%= h params[:parent_id] %> entry <%= entry.kind %>">
 <td style="padding-left: <%=18 * depth%>px;" class="<%=
            @repository.report_last_commit ? "filename" : "filename_no_report" %>">
@@ -23,11 +25,11 @@
 </td>
 <!--<td class="size"><%#= (entry.size ? number_to_human_size(entry.size) : "?") unless entry.is_dir? %></td>-->
   <!--<td class="size"><%#= (entry.size ? number_to_human_size(entry.size) : "?") unless entry.is_dir? %></td>-->
-<% if @repository.report_last_commit %>
-      <td class="revision"><%= link_to_revision(entry.changeset, @repository) if entry.changeset %></td>
-      <td class="age"><%= distance_of_time_in_words(entry.lastrev.time, Time.now) if entry.lastrev && entry.lastrev.time %></td>
-      <td class="author"><%= entry.author %></td>
-      <td class="comments"><%=h truncate(entry.changeset.comments, :length => 50) if entry.changeset %></td>
-<% end %>
+<%# if @repository.report_last_commit %>
+
+      <td class="tree-age c_grey">一个月前<%#= distance_of_time_in_words(entry.lastrev.time, Time.now) if entry.lastrev && entry.lastrev.time %></td>
+      <td class="tree-author c_grey">huang<%#= entry.author %></td>
+      <td class="tree-comments c_grey">修改版本库<%#=h truncate(entry.changeset.comments, :length => 50) if entry.changeset %></td>
+<%# end %>
 </tr>
 <% end %>
diff --git a/lib/gitlab-cli/lib/gitlab/client/repositories.rb b/lib/gitlab-cli/lib/gitlab/client/repositories.rb
index 98a8ea150..990300b31 100644
--- a/lib/gitlab-cli/lib/gitlab/client/repositories.rb
+++ b/lib/gitlab-cli/lib/gitlab/client/repositories.rb
@@ -106,6 +106,23 @@ class Gitlab::Client
     end
     alias_method :repo_rep_stats, :rep_stats
 
+    # Gets a tree activities of project repository.
+    #
+    # @example
+    #   Gitlab.commits('viking')
+    #   Gitlab.repo_commits('gitlab', :ref_name => 'api')
+    #
+    # @param  [Integer] project The ID of a project.
+    # @param  [Hash] options A customizable set of options.
+    # @option options [String] :ref_name The branch or tag name of a project repository.
+    # @option options [String] :creator The user name of a project repository.
+    # @option options [Integer] :period Statistics over time. 1:total 2：one month 3：one week
+    # @return [Array<Gitlab::ObjectifiedHash>]
+    def rep_last_changes(project, options={})
+      get("/projects/#{project}/repository/rep_last_changes", :query => options)
+    end
+    alias_method :repo_rep_stats, :rep_stats
+
     # Get the diff of a commit in a project.
     #
     # @example
diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css
index 085fc64be..a1d372e11 100644
--- a/public/stylesheets/project.css
+++ b/public/stylesheets/project.css
@@ -593,6 +593,9 @@ img.ui-datepicker-trigger {
 .repos_files ul:hover{ background:#ffffdd;}
 .repos_t_c li{ text-align:center;}
 .pic_stats{display:block; background:url(../images/public_icon.png) 0px -548px no-repeat; width:20px; height:15px;}
+.tree-age{width:10%; text-align:right;}
+.tree-author{width:10%; text-align:right;}
+.tree-comments{width:20%; text-align:right;}
 
 
 /* 里程碑 */
@@ -816,7 +819,7 @@ div.changeset { border-bottom: 1px solid #ddd; }
 tr.entry { border: 1px solid #DDD; }
 tr.entry td { white-space: nowrap; }
 tr.entry td.filename { width: 30%; }
-tr.entry td.filename_no_report { width: 70%; }
+tr.entry td.filename_no_report { width: 60%; }
 tr.entry td.size { text-align: right; font-size: 90%; }
 tr.entry td.revision, tr.entry td.author { text-align: center; }
 tr.entry td.age { text-align: right; }

From ad3d27d6b0fe61004da496d4b22dd10f025f7575 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 19 Apr 2016 10:21:12 +0800
Subject: [PATCH 03/10] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=BA=93=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E7=9B=AE=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/repositories_helper.rb               |  4 ++--
 .../repositories/_dir_list_content.html.erb      | 16 +++++++++-------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/app/helpers/repositories_helper.rb b/app/helpers/repositories_helper.rb
index 688fd1505..8d1f11c57 100644
--- a/app/helpers/repositories_helper.rb
+++ b/app/helpers/repositories_helper.rb
@@ -42,10 +42,10 @@ module RepositoriesHelper
   end
 
   # 获取文件目录的最新动态
-  def get_trees_last_changes(project_id, rev)
+  def get_trees_last_changes(project_id, rev, ent_name)
     g = Gitlab.client
     begin
-      tree_changes = g.rep_last_changes(project_id, :rev => rev)
+      tree_changes = g.rep_last_changes(project_id, :rev => rev, :path => ent_name)
       tree_changes
     rescue
       logger.error("faile to get tress activities!")
diff --git a/app/views/repositories/_dir_list_content.html.erb b/app/views/repositories/_dir_list_content.html.erb
index e82f10689..685a18fa8 100644
--- a/app/views/repositories/_dir_list_content.html.erb
+++ b/app/views/repositories/_dir_list_content.html.erb
@@ -3,11 +3,10 @@
    depth = params[:depth].to_i %>
 <%  ent_path = Redmine::CodesetUtil.replace_invalid_utf8(entry.path)   %>
 <%  ent_name = Redmine::CodesetUtil.replace_invalid_utf8(entry.name)   %>
-<% get_trees_last_changes(@project.id, @rev) %>
+<% latest_changes = get_trees_last_changes(@project.gpid, @rev, ent_name) %>
 
 <tr id="<%= tr_id %>" class="<%= h params[:parent_id] %> entry <%= entry.kind %>">
-<td style="padding-left: <%=18 * depth%>px;" class="<%=
-           @repository.report_last_commit ? "filename" : "filename_no_report" %>">
+<td style="padding-left: <%=18 * depth%>px;" class="<%=@repository.report_last_commit ? "filename" : "filename_no_report" %>">
 <% if entry.is_dir? %>
 <%# 展开文件目录 %>
 <span class="expander" onclick="scmEntryClick('<%= tr_id %>', '<%= escape_javascript(url_for(
@@ -21,15 +20,18 @@
 <% end %>
 <%=  link_to h(ent_name),
           {:action => (entry.is_dir? ? 'show' : 'entry'), :id => @project, :repository_id => @repository.identifier_param, :path => to_path_param(ent_path), :rev => @rev},
-          :class => (entry.is_dir? ? 'icon icon-folder' : "icon icon-file #{Redmine::MimeType.css_class_of(ent_name)}")%>
+           :class => (entry.is_dir? ? 'icon icon-folder' : "icon icon-file #{Redmine::MimeType.css_class_of(ent_name)}")%>
 </td>
 <!--<td class="size"><%#= (entry.size ? number_to_human_size(entry.size) : "?") unless entry.is_dir? %></td>-->
   <!--<td class="size"><%#= (entry.size ? number_to_human_size(entry.size) : "?") unless entry.is_dir? %></td>-->
 <%# if @repository.report_last_commit %>
 
-      <td class="tree-age c_grey">一个月前<%#= distance_of_time_in_words(entry.lastrev.time, Time.now) if entry.lastrev && entry.lastrev.time %></td>
-      <td class="tree-author c_grey">huang<%#= entry.author %></td>
-      <td class="tree-comments c_grey">修改版本库<%#=h truncate(entry.changeset.comments, :length => 50) if entry.changeset %></td>
+      <td class="tree-age c_grey">
+        <%#= format_time(latest_changes.first.last_change.split(",")[1]) %>
+        <%= distance_of_time_in_words(latest_changes.first.last_change.split(",")[1], Time.now) if latest_changes && latest_changes.first.last_change %>
+      </td>
+      <td class="tree-author c_grey"><%= (latest_changes.first.last_change.split(",")[2]) if latest_changes && latest_changes.first.last_change %><%#= entry.author %></td>
+      <td class="tree-comments c_grey"><%= (latest_changes.first.last_change.split(",")[3]) if latest_changes && latest_changes.first.last_change %><%#=h truncate(entry.changeset.comments, :length => 50) if entry.changeset %></td>
 <%# end %>
 </tr>
 <% end %>

From 4e4cb309a9974e3a448f84f585b7e52f542bc882 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 19 Apr 2016 15:03:47 +0800
Subject: [PATCH 04/10] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=BA=93=E7=9B=AE?=
 =?UTF-8?q?=E5=BD=95=E6=9C=80=E6=96=B0=E5=8A=A8=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/repositories/_dir_list.html.erb     |  2 +-
 .../repositories/_dir_list_content.html.erb   | 56 +++++++++++--------
 public/stylesheets/project.css                |  6 +-
 3 files changed, 38 insertions(+), 26 deletions(-)

diff --git a/app/views/repositories/_dir_list.html.erb b/app/views/repositories/_dir_list.html.erb
index 771d4d1ec..384ea36b0 100644
--- a/app/views/repositories/_dir_list.html.erb
+++ b/app/views/repositories/_dir_list.html.erb
@@ -1,5 +1,5 @@
 <div class="autoscroll">
-<table class="list entries" id="browser">
+<table class="list entries" id="browser" style="table-layout: fixed;">
 
 <tbody>
 <%= render :partial => 'dir_list_content' %>
diff --git a/app/views/repositories/_dir_list_content.html.erb b/app/views/repositories/_dir_list_content.html.erb
index 685a18fa8..b04e40905 100644
--- a/app/views/repositories/_dir_list_content.html.erb
+++ b/app/views/repositories/_dir_list_content.html.erb
@@ -1,15 +1,15 @@
 <% @entries.each do |entry| %>
-<% tr_id = Digest::MD5.hexdigest(entry.path)
-   depth = params[:depth].to_i %>
-<%  ent_path = Redmine::CodesetUtil.replace_invalid_utf8(entry.path)   %>
-<%  ent_name = Redmine::CodesetUtil.replace_invalid_utf8(entry.name)   %>
-<% latest_changes = get_trees_last_changes(@project.gpid, @rev, ent_name) %>
+    <% tr_id = Digest::MD5.hexdigest(entry.path)
+       depth = params[:depth].to_i %>
+    <%  ent_path = Redmine::CodesetUtil.replace_invalid_utf8(entry.path)   %>
+    <%  ent_name = Redmine::CodesetUtil.replace_invalid_utf8(entry.name)   %>
+    <% latest_changes = get_trees_last_changes(@project.gpid, @rev, ent_name) %>
 
-<tr id="<%= tr_id %>" class="<%= h params[:parent_id] %> entry <%= entry.kind %>">
-<td style="padding-left: <%=18 * depth%>px;" class="<%=@repository.report_last_commit ? "filename" : "filename_no_report" %>">
-<% if entry.is_dir? %>
+    <tr id="<%= tr_id %>" class="<%= h params[:parent_id] %> entry <%= entry.kind %>">
+      <td style="padding-left: <%=18 * depth%>px;" class="filename_no_report hidden">
+        <% if entry.is_dir? %>
 <%# 展开文件目录 %>
-<span class="expander" onclick="scmEntryClick('<%= tr_id %>', '<%= escape_javascript(url_for(
+            <span class="expander" onclick="scmEntryClick('<%= tr_id %>', '<%= escape_javascript(url_for(
                        :action => 'show',
                        :id     => @project,
                        :repository_id => @repository.identifier_param,
@@ -17,21 +17,33 @@
                        :rev    => @rev,
                        :depth  => (depth + 1),
                        :parent_id => tr_id)) %>');">&nbsp;</span>
-<% end %>
-<%=  link_to h(ent_name),
+        <% end %>
+        <a class="<%= (entry.is_dir? ? 'icon icon-folder' : "icon icon-file #{Redmine::MimeType.css_class_of(ent_name)}") %>">
+          <%= h(ent_name) %>
+        </a>
+        <%#= h(ent_name), :class => "(entry.is_dir? ? 'icon icon-folder' : "icon icon-file #{Redmine::MimeType.css_class_of(ent_name)}")%>
+<%#=  link_to h(ent_name),
           {:action => (entry.is_dir? ? 'show' : 'entry'), :id => @project, :repository_id => @repository.identifier_param, :path => to_path_param(ent_path), :rev => @rev},
            :class => (entry.is_dir? ? 'icon icon-folder' : "icon icon-file #{Redmine::MimeType.css_class_of(ent_name)}")%>
-</td>
-<!--<td class="size"><%#= (entry.size ? number_to_human_size(entry.size) : "?") unless entry.is_dir? %></td>-->
-  <!--<td class="size"><%#= (entry.size ? number_to_human_size(entry.size) : "?") unless entry.is_dir? %></td>-->
-<%# if @repository.report_last_commit %>
-
-      <td class="tree-age c_grey">
-        <%#= format_time(latest_changes.first.last_change.split(",")[1]) %>
-        <%= distance_of_time_in_words(latest_changes.first.last_change.split(",")[1], Time.now) if latest_changes && latest_changes.first.last_change %>
       </td>
-      <td class="tree-author c_grey"><%= (latest_changes.first.last_change.split(",")[2]) if latest_changes && latest_changes.first.last_change %><%#= entry.author %></td>
-      <td class="tree-comments c_grey"><%= (latest_changes.first.last_change.split(",")[3]) if latest_changes && latest_changes.first.last_change %><%#=h truncate(entry.changeset.comments, :length => 50) if entry.changeset %></td>
+      <!--<td class="size"><%#= (entry.size ? number_to_human_size(entry.size) : "?") unless entry.is_dir? %></td>-->
+      <!--<td class="size"><%#= (entry.size ? number_to_human_size(entry.size) : "?") unless entry.is_dir? %></td>-->
+<%# if @repository.report_last_commit %>
+      <td class="tree-comments c_grey hidden">
+        <div class="hidden" title="<%= (latest_changes.message) if latest_changes && latest_changes.message %>">
+          <%= (latest_changes.message) if latest_changes && latest_changes.message %>
+        </div>
+      </td>
+      <td class="tree-author c_grey">
+        <div class="hidden" title="<%= (latest_changes.author) if latest_changes && latest_changes.author %>">
+          <%= (latest_changes.author) if latest_changes && latest_changes.author %>
+        </div>
+      </td>
+      <td class="tree-age c_grey">
+        <div class="hidden" title="<%= distance_of_time_in_words(latest_changes.time, Time.now) if latest_changes && latest_changes.time %>"><%= distance_of_time_in_words(latest_changes.time, Time.now) if latest_changes && latest_changes.time %></div>
+      </td>
+
+
 <%# end %>
-</tr>
+    </tr>
 <% end %>
diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css
index a1d372e11..ee6050a8f 100644
--- a/public/stylesheets/project.css
+++ b/public/stylesheets/project.css
@@ -594,8 +594,8 @@ img.ui-datepicker-trigger {
 .repos_t_c li{ text-align:center;}
 .pic_stats{display:block; background:url(../images/public_icon.png) 0px -548px no-repeat; width:20px; height:15px;}
 .tree-age{width:10%; text-align:right;}
-.tree-author{width:10%; text-align:right;}
-.tree-comments{width:20%; text-align:right;}
+.tree-author{width:10%; text-align:left;}
+.tree-comments{width:40%; text-align:left;}
 
 
 /* 里程碑 */
@@ -819,7 +819,7 @@ div.changeset { border-bottom: 1px solid #ddd; }
 tr.entry { border: 1px solid #DDD; }
 tr.entry td { white-space: nowrap; }
 tr.entry td.filename { width: 30%; }
-tr.entry td.filename_no_report { width: 60%; }
+tr.entry td.filename_no_report { width: 40%; }
 tr.entry td.size { text-align: right; font-size: 90%; }
 tr.entry td.revision, tr.entry td.author { text-align: center; }
 tr.entry td.age { text-align: right; }

From 449bdf2225d20c293b4944214b79fdbbb0e2de65 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 20 Apr 2016 16:40:44 +0800
Subject: [PATCH 05/10] =?UTF-8?q?=E5=AE=8C=E6=88=90=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=BA=93=E7=BB=9F=E8=AE=A1=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repositories/_dir_list_content.html.erb   | 46 ++++++++++---------
 1 file changed, 24 insertions(+), 22 deletions(-)

diff --git a/app/views/repositories/_dir_list_content.html.erb b/app/views/repositories/_dir_list_content.html.erb
index b04e40905..79ed44b99 100644
--- a/app/views/repositories/_dir_list_content.html.erb
+++ b/app/views/repositories/_dir_list_content.html.erb
@@ -1,9 +1,10 @@
 <% @entries.each do |entry| %>
     <% tr_id = Digest::MD5.hexdigest(entry.path)
        depth = params[:depth].to_i %>
-    <%  ent_path = Redmine::CodesetUtil.replace_invalid_utf8(entry.path)   %>
-    <%  ent_name = Redmine::CodesetUtil.replace_invalid_utf8(entry.name)   %>
-    <% latest_changes = get_trees_last_changes(@project.gpid, @rev, ent_name) %>
+    <% 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)   %>
+    <% latest_changes = get_trees_last_changes(@project.gpid, @rev, ent_path) %>
 
     <tr id="<%= tr_id %>" class="<%= h params[:parent_id] %> entry <%= entry.kind %>">
       <td style="padding-left: <%=18 * depth%>px;" class="filename_no_report hidden">
@@ -15,35 +16,36 @@
                        :repository_id => @repository.identifier_param,
                        :path   => to_path_param(ent_path),
                        :rev    => @rev,
+                       :latest_changes => latest_changes,
                        :depth  => (depth + 1),
                        :parent_id => tr_id)) %>');">&nbsp;</span>
         <% end %>
-        <a class="<%= (entry.is_dir? ? 'icon icon-folder' : "icon icon-file #{Redmine::MimeType.css_class_of(ent_name)}") %>">
-          <%= h(ent_name) %>
-        </a>
+        <!--<a class="<%#= (entry.is_dir? ? 'icon icon-folder' : "icon icon-file #{Redmine::MimeType.css_class_of(ent_name)}") %>">-->
+          <!--<%#= h(ent_name) %>-->
+        <!--</a>-->
         <%#= h(ent_name), :class => "(entry.is_dir? ? 'icon icon-folder' : "icon icon-file #{Redmine::MimeType.css_class_of(ent_name)}")%>
-<%#=  link_to h(ent_name),
+<%=  link_to h(ent_name),
           {:action => (entry.is_dir? ? 'show' : 'entry'), :id => @project, :repository_id => @repository.identifier_param, :path => to_path_param(ent_path), :rev => @rev},
            :class => (entry.is_dir? ? 'icon icon-folder' : "icon icon-file #{Redmine::MimeType.css_class_of(ent_name)}")%>
       </td>
       <!--<td class="size"><%#= (entry.size ? number_to_human_size(entry.size) : "?") unless entry.is_dir? %></td>-->
       <!--<td class="size"><%#= (entry.size ? number_to_human_size(entry.size) : "?") unless entry.is_dir? %></td>-->
 <%# if @repository.report_last_commit %>
-      <td class="tree-comments c_grey hidden">
-        <div class="hidden" title="<%= (latest_changes.message) if latest_changes && latest_changes.message %>">
-          <%= (latest_changes.message) if latest_changes && latest_changes.message %>
-        </div>
-      </td>
-      <td class="tree-author c_grey">
-        <div class="hidden" title="<%= (latest_changes.author) if latest_changes && latest_changes.author %>">
-          <%= (latest_changes.author) if latest_changes && latest_changes.author %>
-        </div>
-      </td>
-      <td class="tree-age c_grey">
-        <div class="hidden" title="<%= distance_of_time_in_words(latest_changes.time, Time.now) if latest_changes && latest_changes.time %>"><%= distance_of_time_in_words(latest_changes.time, Time.now) if latest_changes && latest_changes.time %></div>
-      </td>
-
-
+      <div id="children_tree">
+        <td class="tree-comments c_grey hidden">
+          <div class="hidden" title="<%= (latest_changes.message) if latest_changes && latest_changes.message %>">
+            <%= (latest_changes.message) if latest_changes && latest_changes.message %>
+          </div>
+        </td>
+        <td class="tree-author c_grey">
+          <div class="hidden" title="<%= (latest_changes.author) if latest_changes && latest_changes.author %>">
+            <%= (latest_changes.author) if latest_changes && latest_changes.author %>
+          </div>
+        </td>
+        <td class="tree-age c_grey">
+          <div class="hidden" title="<%= distance_of_time_in_words(latest_changes.time, Time.now) if latest_changes && latest_changes.time %>"><%= distance_of_time_in_words(latest_changes.time, Time.now) if latest_changes && latest_changes.time %></div>
+        </td>
+      </div>
 <%# end %>
     </tr>
 <% end %>

From e8048f8eb71065fcc7d5b11e5ae9145478cc4488 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 21 Apr 2016 10:09:52 +0800
Subject: [PATCH 06/10] =?UTF-8?q?=E5=AE=8C=E6=88=90=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=BA=93=E6=97=B6=E9=97=B4UTC=E4=B8=8E=E5=8C=97=E4=BA=AC?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E7=9A=84=E8=BD=AC=E6=8D=A2=20=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E5=9B=BD=E9=99=85=E5=8C=96=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/repositories_helper.rb                | 6 ++++++
 app/views/repositories/_dir_list_content.html.erb | 6 +++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/helpers/repositories_helper.rb b/app/helpers/repositories_helper.rb
index 8d1f11c57..3cf781f76 100644
--- a/app/helpers/repositories_helper.rb
+++ b/app/helpers/repositories_helper.rb
@@ -52,6 +52,12 @@ module RepositoriesHelper
     end
   end
 
+  def translate_time time
+    case time
+      when time.include("")
+    end
+  end
+
   # 获取diff内容行号
   def diff_line_num content
     content.scan(/@@ -(\d+),\d+ \+\d+,\d+ @@/).first.join("").to_i
diff --git a/app/views/repositories/_dir_list_content.html.erb b/app/views/repositories/_dir_list_content.html.erb
index 79ed44b99..60c4aa3bf 100644
--- a/app/views/repositories/_dir_list_content.html.erb
+++ b/app/views/repositories/_dir_list_content.html.erb
@@ -43,7 +43,11 @@
           </div>
         </td>
         <td class="tree-age c_grey">
-          <div class="hidden" title="<%= distance_of_time_in_words(latest_changes.time, Time.now) if latest_changes && latest_changes.time %>"><%= distance_of_time_in_words(latest_changes.time, Time.now) if latest_changes && latest_changes.time %></div>
+          <div class="hidden" title="<%= distance_of_time_in_words(latest_changes.time, Time.now + 8.hours) if latest_changes && latest_changes.time %>">
+            <%# 为了转换UTC时间，时差8小时 %>
+            <%= distance_of_time_in_words(latest_changes.time, Time.now + 8.hours) if latest_changes && latest_changes.time %>
+            <%#= latest_changes.time if latest_changes && latest_changes.time %>
+          </div>
         </td>
       </div>
 <%# end %>

From ba171c49cc7abe6f30f7db2fd98432943014bdb6 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 21 Apr 2016 10:42:06 +0800
Subject: [PATCH 07/10] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=20=E6=94=B9=E6=88=90?=
 =?UTF-8?q?=20=E4=BB=A3=E7=A0=81=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/repositories/show.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb
index 329dee898..82e6f871f 100644
--- a/app/views/repositories/show.html.erb
+++ b/app/views/repositories/show.html.erb
@@ -25,7 +25,7 @@
       <textarea id="copy_rep_content" class="cloneUrl mt5 fl" type="input" ><%= @repository.type.to_s=="Repository::Gitlab" ? @repos_url.to_s.lstrip : @repository.url %></textarea>
       <a href="javascript:void(0);" class="clone_btn mt5" onclick="jsCopy()"><span class="vl_copy" title="点击复制版本库地址"></span></a>
       <div class="fl mt5 ml15">
-        <%=link_to "统计", stats_repository_project_path(:id => @project.id, :repository_id => @repository.identifier, :rev => @rev, :creator => @creator, :default_branch => @g_default_branch ), :class => "fl vl_zip" %>
+        <%=link_to "代码统计", stats_repository_project_path(:id => @project.id, :repository_id => @repository.identifier, :rev => @rev, :creator => @creator, :default_branch => @g_default_branch ), :class => "fl vl_zip" %>
       </div>
       <%# 针对公开项目：用户必须创建了项目，否则用户无法同步 %>
       <% if User.current.id != @project.user_id %>

From 42076a137dffd8b19472e75457dd6e75a9ea18ff Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 21 Apr 2016 11:19:21 +0800
Subject: [PATCH 08/10] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/repositories_controller.rb | 2 --
 app/views/projects/show.html.erb           | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index 380e880ad..0edd11129 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -586,8 +586,6 @@ update
         end
       end
     end
-    # @static_month__per_user = g.rep_stats(project_id, :rev => rev, :creator => creator, :period => 2)
-    # @static_week_per_user = g.rep_stats(project_id, :rev => rev, :creator => creator, :period => 3)
     rescue
       render_404
       return
diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb
index 72a419f55..c0bb15ab4 100644
--- a/app/views/projects/show.html.erb
+++ b/app/views/projects/show.html.erb
@@ -29,7 +29,7 @@
     <!--CONTENT LIST-->
 
   </div>
-  <% unless @project.gpid.nil? || @project.project_score.changeset_num == 0 %>
+  <% unless @project.gpid.nil? || @project.project_score.changeset_num == 0 || @project.rep_statics.blank? %>
   <div class="resources mt10">
     <div class="homepagePostBrief">
       <%= render :partial => "rep_static" %>

From 81f8559c48f2cd9cdfcbc9887eeea657d6de47be Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 21 Apr 2016 16:04:00 +0800
Subject: [PATCH 09/10] =?UTF-8?q?gitlab=E7=89=88=E6=9C=AC=E5=BA=93?=
 =?UTF-8?q?=E6=88=90=E5=91=98=E5=90=8C=E6=AD=A5=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/tasks/gitlab.rake      | 16 ++++++++++++++++
 lib/trustie/gitlab/sync.rb |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/lib/tasks/gitlab.rake b/lib/tasks/gitlab.rake
index 729c9245f..bf43551c6 100644
--- a/lib/tasks/gitlab.rake
+++ b/lib/tasks/gitlab.rake
@@ -11,6 +11,22 @@ namespace :gitlab do
       end
     end
 
+    task :members => :environment do
+      projects = Project.where("gpid is not null")
+      s = Trustie::Gitlab::Sync.new
+      g = Gitlab.client
+      projects.each do |project|
+        begin
+          if project.members.count != g.team_members(project.gpid).count
+            puts project.id
+            s.only_members(project)
+          end
+        rescue => e
+          puts e
+        end
+      end
+    end
+
     desc "update user password"
     task :password => :environment do
       s = Trustie::Gitlab::Sync.new
diff --git a/lib/trustie/gitlab/sync.rb b/lib/trustie/gitlab/sync.rb
index 2f4f77c53..3520098a9 100644
--- a/lib/trustie/gitlab/sync.rb
+++ b/lib/trustie/gitlab/sync.rb
@@ -122,7 +122,7 @@ module Trustie
           project.members.each do |m|
             begin
               gid = m.user.gid
-              unless gid
+              if gid.nil?
                 gid = sync_user(m.user).id
               end
               self.g.add_team_member(project.gpid, gid, get_gitlab_role(m))

From cb2033c80f84f981e14b62a5f0b5d8fd016567f2 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 21 Apr 2016 16:20:29 +0800
Subject: [PATCH 10/10] =?UTF-8?q?=E5=8E=BB=E6=8E=89rake=E4=B8=AD=E8=BE=93?=
 =?UTF-8?q?=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/tasks/gitlab.rake | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/tasks/gitlab.rake b/lib/tasks/gitlab.rake
index bf43551c6..7893195ac 100644
--- a/lib/tasks/gitlab.rake
+++ b/lib/tasks/gitlab.rake
@@ -18,7 +18,6 @@ namespace :gitlab do
       projects.each do |project|
         begin
           if project.members.count != g.team_members(project.gpid).count
-            puts project.id
             s.only_members(project)
           end
         rescue => e