Merge branch 'dev_trustie' of http://gitea.trustie.net/jasder/forgeplus into dev_trustie

app/views/issues/edit.json.jbuilder

@@ -3,8 +3,8 @@ json.extract! @issue, :id,:subject,:description,:is_private,:assigned_to_id,:tra
               :start_date,:due_date,:estimated_hours, :issue_type, :token,:issue_classify, :branch_name
 json.done_ratio @issue.done_ratio.to_s + "%"
 json.issue_tags @issue.get_issue_tags
-json.issue_chosen @issue_chosen
-json.branches @all_branches
+# json.issue_chosen @issue_chosen
+# json.branches @all_branches
 json.attachments do
   json.array! @issue_attachments do |attachment|
     json.partial! "attachments/attachment_simple", locals: {attachment: attachment}

app/views/issues/show.json.jbuilder

@@ -15,7 +15,7 @@ json.priority @issue.priority.try(:name)
 json.version @issue.version.try(:name)
 json.issue_tags @issue.get_issue_tags
 json.done_ratio @issue.done_ratio.to_s + "%" 
-json.issue_type @issue.issue_type == "1" ? "普通" : "悬赏"
+json.issue_type @issue.issue_type
 json.token @issue.issue_type == "2" ? @issue.token : ""
 json.join_users @join_users
 json.cost_time @cost_time_array

app/views/repositories/show.json.jbuilder

@@ -17,6 +17,7 @@ json.branches_count @branches_count
 json.commits_count @commits_count
 json.permission render_edit_project_permission(current_user, @project) if current_user
 json.mirror_url @project&.repository.mirror_url
+json.mirror @project&.repository.mirror_url.present?
 json.watched current_user&.watched?(@project)
 json.praised current_user&.liked?(@project)
 json.status @project.status
@@ -35,6 +36,6 @@ json.clone_url @result['clone_url']
 json.default_branch @result['default_branch']
 json.empty @result['empty']
 json.full_name @result['full_name']
-json.mirror @result['mirror']
+
 json.private @result['private']
 json.partial! 'author', locals: { user: @project.owner }

app/views/users/homepage_info.json.jbuilder

@@ -8,7 +8,8 @@ json.brief_introduction @user.user_extension&.brief_introduction
 json.professional_certification @user.professional_certification
 json.followed User.current.watched?(@user)
 json.projects_count @user.projects_count
-
+json.undo_events @undo_events
+json.user_composes_count @user_composes_count
 # json.id @user.id
 # json.name @user.full_name
 # json.avatar_url url_to_avatar(@user)