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 activate repo's bug

This commit is contained in:
Jasder 2020-09-04 16:57:23 +08:00
parent e0dac72114
commit 5c2bb71e57
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,10 +30,8 @@ class Ci::CloudAccountsController < Ci::BaseController
ci_user = Ci::User.find_by(user_login: current_user.login) ci_user = Ci::User.find_by(user_login: current_user.login)
repo = Ci::Repo.where(repo_namespace: current_user.login, repo_name: params[:repo]).first repo = Ci::Repo.where(repo_namespace: current_user.login, repo_name: params[:repo]).first
begin begin
result = bind_hook!(current_user, @cloud_account, @repo)
return render_error('hook激活失败') unless result
repo.activate!(ci_user.user_id) repo.activate!(ci_user.user_id)
bind_hook!(current_user, @cloud_account, repo)
@project.update_columns(:open_devops, true, gitea_webhook_id: result['id']) @project.update_columns(:open_devops, true, gitea_webhook_id: result['id'])
@cloud_account.update_column(:ci_user_id, ci_user.user_id) @cloud_account.update_column(:ci_user_id, ci_user.user_id)