From d27f55bb35b863b6110df7680d2e76ab9aeb0f99 Mon Sep 17 00:00:00 2001 From: xiaoxiaoqiong Date: Fri, 27 May 2022 16:55:52 +0800 Subject: [PATCH] =?UTF-8?q?fixed=20ci=E6=8A=A5=E9=94=99200=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/ci/projects_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/ci/projects_controller.rb b/app/controllers/ci/projects_controller.rb index 06e515378..c358611eb 100644 --- a/app/controllers/ci/projects_controller.rb +++ b/app/controllers/ci/projects_controller.rb @@ -41,7 +41,7 @@ class Ci::ProjectsController < Ci::BaseController ActiveRecord::Base.transaction do if @repo @repo.destroy! if @repo&.repo_user_id == 0 - return render_error('该项目已经激活') if @repo.repo_active? + return tip_exception('该项目已经激活') if @repo.repo_active? @repo.activate!(@project) else @repo = Ci::Repo.auto_create!(@ci_user, @project) @@ -55,7 +55,7 @@ class Ci::ProjectsController < Ci::BaseController end render_ok rescue Exception => ex - render_error(ex.message) + tip_exception(ex.message) end end