Merge branch 'pre_trustie_server' into trustie_server

app/controllers/commit_logs_controller.rb

@@ -22,7 +22,7 @@ class CommitLogsController < ApplicationController
       commit_log = CommitLog.create(user: user, project: project, repository_id: repository_id,
                        name: repository_name, full_name: repository_full_name,
                        ref: ref, commit_id: commit_id, message: message)
-      commit_log.project_trends.create(user_id: user.id, project_id: project&.id, action_type: "create")
+      commit_log.project_trends.create(user_id: user.id, project_id: project&.id, action_type: "create") if user.id !=2
       # 统计数据新增
       CacheAsyncSetJob.perform_later("project_common_service", {commits: 1}, project.id)
     end