Merge branch 'standalone_develop' into pre_trustie_server

app/models/issue_tag.rb

@@ -28,7 +28,7 @@ class IssueTag < ApplicationRecord
   belongs_to :project, optional: true, counter_cache: true
   belongs_to :user, optional: true
 
-  validates :name, uniqueness: { message: "已存在" }
+  validates :name, uniqueness: {scope: :project_id, message: "已存在" }
 
   def self.init_data(project_id)
     data = [

app/views/project_trends/_detail.json.jbuilder

@@ -19,8 +19,10 @@ if trend.trend_type == "Issue"
 elsif trend.trend_type == "VersionRelease"
   json.partial! "version_releases/simple_version_release", locals: {version: trend.trend}
 elsif trend.trend_type == "CommitLog"
+  commit_log = trend.trend
+  json.name commit_log.message
+  json.created_at format_time(commit_log.created_at)
   json.commit_log do
-    commit_log = trend.trend
     json.user do
       json.partial! 'users/user_simple', locals: {user: commit_log.user}
     end