Merge pull request '同步通用代码到预上线' (#274) from develop into standalone_develop

app/controllers/issue_tags_controller.rb

@@ -17,7 +17,7 @@ class IssueTagsController < ApplicationController
 
 
   def create
-    title = params[:name].to_s.strip.first(10)
+    title = params[:name].to_s.strip.first(15)
     desc = params[:description].to_s.first(30)
     color = params[:color] || "#ccc"
 
@@ -60,8 +60,8 @@ class IssueTagsController < ApplicationController
   end
 
   def update
-    title = params[:name]
-    desc = params[:description]
+    title = params[:name].to_s.strip.first(15)
+    desc = params[:description].to_s.first(30)
     color = params[:color] || "#ccc"
 
     tag_params = {

app/controllers/issues_controller.rb

@@ -15,6 +15,7 @@ class IssuesController < ApplicationController
   include TagChosenHelper
 
   def index
+    @user_operate_issue = current_user.present? && current_user.logged? && (current_user.admin || @project.member?(current_user))
     @user_admin_or_member = current_user.present? && current_user.logged? && (current_user.admin || @project.member?(current_user) || @project.is_public?)
     issues = @project.issues.issue_issue.issue_index_includes
     issues = issues.where(is_private: false) unless @user_admin_or_member

app/services/pull_requests/create_service.rb

@@ -150,7 +150,7 @@ class PullRequests::CreateService < ApplicationService
     raise "title参数不能为空" if @params[:title].blank?
     raise "head参数不能为空" if @params[:head].blank?
     raise "base参数不能为空" if @params[:base].blank?
-    raise "fork_project_id参数错误" unless @project.forked_projects.pluck(:id).include?(@params[:fork_project_id])
+    raise "fork_project_id参数错误" if is_original && !@project.forked_projects.pluck(:id).include?(@params[:fork_project_id].to_i)
     raise "分支内容相同，无需创建合并请求" if @params[:head] === @params[:base] && !is_original
     raise "合并请求已存在" if @project&.pull_requests.where(head: @params[:head], base: @params[:base], status: 0, is_original: is_original, fork_project_id: @params[:fork_project_id]).present?
     raise @pull_issue.errors.full_messages.join(", ") unless pull_issue.valid?

app/views/compare/show.json.jbuilder

@@ -3,19 +3,11 @@ json.commits_count @compare_result['Commits']&.size
 json.commits do
   json.array! @compare_result['Commits'] do |commit|
     json.author do
-      # TODO: 获取头像地址待优化
-      forge_user = User.includes(:user_extension).find_by(login: commit['Author']['Name'])
-      json.login commit['Author']['Name']
-      json.name commit['Author']['Name']
-      json.image_url forge_user.nil? ? '' : url_to_avatar(forge_user)
+      json.partial! 'repositories/commit_author', locals: { user: render_cache_commit_author(commit['Committer']), name: commit['Committer']['Name'] }
     end
 
     json.committer do
-      # TODO: 获取头像地址待优化
-      forge_user = User.includes(:user_extension).find_by(login: commit['Committer']['Name'])
-      json.login commit['Committer']['Name']
-      json.name commit['Committer']['Name']
-      json.image_url forge_user.nil? ? '' : url_to_avatar(forge_user)
+      json.partial! 'repositories/commit_author', locals: { user: render_cache_commit_author(commit['Committer']), name: commit['Committer']['Name'] }
     end
     json.timestamp render_unix_time(commit['Committer']['When'])
     json.time_from_now time_from_now(commit['Committer']['When'])

app/views/issues/index.json.jbuilder

@@ -7,6 +7,7 @@ json.my_published_count @my_published.size
 json.search_count @issues_size
 json.limit @limit
 json.user_admin_or_member @user_admin_or_member
+json.user_operate_issue @user_operate_issue
 
 json.issues do
   json.array! @issues.to_a do |issue|

config/locales/forms/projects_update_form.zh-CN.yml

@@ -3,6 +3,7 @@
     attributes:
       projects/update_form:
         name: 项目名称
+        identifier: 项目标识
         description: 项目简介
         project_category_id: 项目类别
         project_language_id: 项目语言