Merge branch 'dev-homepage-revision' into 'develop'

修复管理员不能删除项目的bug 修复管理员不能删除项目的bug See merge request !187
2019-10-11 13:58:56 +08:00 · 2019-10-11 13:58:56 +08:00 · aa4706c13b
parent f3aa5c1718 6c9f4b08ee
commit aa4706c13b
1 changed files with 1 additions and 1 deletions
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@ -1121,7 +1121,7 @@ class ProjectsController < ApplicationController
  def destroy
    ActiveRecord::Base.transaction do
      g = Gitlab.client
-      g.delete_project(@project.gpid)
+      g.delete_project(@project.gpid) unless @project.gpid.blank?
      # 删除Trustie版本库记录
      repoisitory = Repository.where(:project_id => @project.id, :type => GITLABTYPE).first
      repoisitory.delete unless repository.blank?