Merge branch 'develop' into standalone_develop

app/controllers/attachments_controller.rb

@@ -217,7 +217,7 @@ class AttachmentsController < ApplicationController
         if @file.container && current_user.logged?
           if @file.container.is_a?(Issue)
             course = @file.container.project
-            candown = course.member?(current_user)
+            candown = course.member?(current_user) || course.is_public
           elsif @file.container.is_a?(Journal)
             course = @file.container.issue.project
             candown = course.member?(current_user)

app/controllers/compare_controller.rb

@@ -16,6 +16,7 @@ class CompareController < ApplicationController
     if @base.blank? || @head.blank?
       return -2, "请选择分支"
     else
+      return -2, "目标仓库未开启合并请求（PR）功能" unless @project.has_menu_permission("pulls")
       if @head.include?(":")
         fork_project = @project.forked_projects.joins(:owner).where(users: {login: @head.to_s.split("/")[0]}).take
         return -2, "请选择正确的仓库" unless fork_project.present?

app/controllers/organizations/organization_users_controller.rb

@@ -5,7 +5,11 @@ class Organizations::OrganizationUsersController < Organizations::BaseController
   def index
     @organization_users = @organization.organization_users.includes(:user)
     search = params[:search].to_s.downcase
-    @organization_users = @organization_users.joins(:user).merge(User.like(search))
+    user_condition_users = User.like(search).to_sql 
+    team_condition_teams = User.joins(:teams).merge(@organization.teams.like(search)).to_sql
+    users = User.from("( #{user_condition_users} UNION #{team_condition_teams }) AS users")
+   
+    @organization_users = @organization_users.where(user_id: users).distinct
 
     @organization_users = kaminari_paginate(@organization_users)
   end

app/controllers/projects_controller.rb

@@ -135,7 +135,7 @@ class ProjectsController < ApplicationController
         validate_params = project_params.slice(:name, :description, 
           :project_category_id, :project_language_id, :private, :identifier)
   
-        Projects::UpdateForm.new(validate_params.merge(user_id: @project.user_id, project_identifier: @project.identifier)).validate!
+        Projects::UpdateForm.new(validate_params.merge(user_id: @project.user_id, project_identifier: @project.identifier, project_name: @project.name)).validate!
   
         private = @project.forked_from_project.present? ? !@project.forked_from_project.is_public : params[:private] || false
 

app/controllers/pull_requests_controller.rb

@@ -2,7 +2,7 @@ class PullRequestsController < ApplicationController
   before_action :require_login, except: [:index, :show, :files, :commits]
   before_action :require_profile_completed, only: [:create]
   before_action :load_repository
-  before_action :check_menu_authorize
+  before_action :check_menu_authorize, only: [:index, :show, :create, :update, :refuse_merge, :pr_merge]
   before_action :find_pull_request, except: [:index, :new, :create, :check_can_merge,:get_branches,:create_merge_infos, :files, :commits]
   before_action :load_pull_request, only: [:files, :commits]
   before_action :find_atme_receivers, only: [:create, :update]

app/forms/projects/update_form.rb

@@ -1,5 +1,5 @@
 class Projects::UpdateForm < BaseForm
-  attr_accessor :name, :description, :project_category_id, :project_language_id, :private, :identifier, :user_id, :project_identifier
+  attr_accessor :name, :description, :project_category_id, :project_language_id, :private, :identifier, :user_id, :project_identifier, :project_name
   validates :name, presence: true
   validates :name, length: { maximum: 50 }
   validates :description, length: { maximum: 200 }
@@ -10,6 +10,7 @@ class Projects::UpdateForm < BaseForm
     check_project_language(project_language_id)
 
     check_repository_name(user_id, identifier) unless identifier.blank? || identifier == project_identifier
+    check_project_name(user_id, name) unless name.blank? || name == project_name
   end
 
 end

app/models/team.rb

@@ -29,6 +29,11 @@ class Team < ApplicationRecord
   has_many :team_units, dependent: :destroy
   has_many :team_users, dependent: :destroy
 
+  scope :like, lambda { |keywords|
+    sql = "teams.nickname LIKE :search OR teams.name LIKE :search"
+    where(sql, :search => "%#{keywords.split(" ").join('|')}%") unless keywords.blank?
+  }
+
   validates :name, uniqueness: {scope: :organization_id}
 
   enum authorize: {read: 1, write: 2, admin: 3, owner: 4}

app/services/pull_requests/create_service.rb

@@ -157,6 +157,7 @@ class PullRequests::CreateService < ApplicationService
     raise "head参数不能为空" if @params[:head].blank?
     raise "base参数不能为空" if @params[:base].blank?
     raise "fork_project_id参数错误" if is_original && !@project.forked_projects.pluck(:id).include?(@params[:fork_project_id].to_i)
+    raise "merge_user_login参数错误" if is_original && @project.fork_users.joins(:user).where(users: {login: @params[:merge_user_login]}).blank?
     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/organizations/organization_users/_detail.json.jbuilder

@@ -3,5 +3,5 @@ json.user do
   json.partial! "organizations/user_detail", user: org_user.user
 end
 
-json.team_names org_user.teams.pluck(:name)
+json.team_names org_user.teams.pluck(:nickname)
 json.created_at org_user.created_at.strftime("%Y-%m-%d")

app/views/projects/fork_users.json.jbuilder

@@ -1,7 +1,7 @@
 json.count @forks_count
 json.users do
   json.array! @fork_users.each do |f|
-    user = f.user
+    user = f.user.present? ? f.user : Organization.find_by(id: f.user_id)
     json.id f.fork_project.id
     json.identifier f.fork_project.identifier
     json.name "#{user.try(:show_real_name)}/#{f.fork_project.try(:name)}"