floraachy
/
gitlink-forgeplus
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

FIX ci certification bug

This commit is contained in:
Jasder 2020-10-16 09:47:36 +08:00
parent e430645304
commit edcb9f863c
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/ci/cloud_accounts_controller.rb
View File

@ -30,9 +30,8 @@ class Ci::CloudAccountsController < Ci::BaseController
end end
def activate def activate
return render_error('请先在指定地址做用户认证') unless current_user.ci_certification? return render_error('请先认证') unless current_user.ci_certification?
return render_error('该项目已经激活') if @repo && @repo.repo_active?
begin begin
@cloud_account = Ci::CloudAccount.find params[:id] @cloud_account = Ci::CloudAccount.find params[:id]
ActiveRecord::Base.transaction do ActiveRecord::Base.transaction do

2
app/models/concerns/droneable.rb
View File

@ -22,7 +22,7 @@ module Droneable
def ci_certification? def ci_certification?
return false if self.is_a?(AnonymousUser) return false if self.is_a?(AnonymousUser)
devops_unverified? && Ci::User.exists?(user_login: self.login) devops_certification? && Ci::User.exists?(user_login: self.login)
end end
def unbind_account! def unbind_account!