From 48350dc6f299360efb5725547066b09b060f0a11 Mon Sep 17 00:00:00 2001
From: Jasder <2053003901@@qq.com>
Date: Fri, 4 Sep 2020 16:26:00 +0800
Subject: [PATCH] FIX delete webhook for bind ci service

---
 app/controllers/ci/cloud_accounts_controller.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/controllers/ci/cloud_accounts_controller.rb b/app/controllers/ci/cloud_accounts_controller.rb
index 91be6c0a3..5702f397b 100644
--- a/app/controllers/ci/cloud_accounts_controller.rb
+++ b/app/controllers/ci/cloud_accounts_controller.rb
@@ -141,8 +141,10 @@ class Ci::CloudAccountsController < Ci::BaseController
       # TODO
       # 删除用户项目下的与ci相关的所有webhook
       user.projects.select(:id, :identifier, :gitea_webhook_id).each do |project|
-        result = Gitea::Hooks::DestroyService.call(user.gitea_token, user.login, project.identifier, project.gitea_webhook_id) unless project.gitea_webhook_id.blank?
-        project.update_column(:gitea_webhook_id, nil) if result.status == 204
+        if project.gitea_webhook_id
+          result = Gitea::Hooks::DestroyService.call(user.gitea_token, user.login, project.identifier, project.gitea_webhook_id)
+          project.update_column(:gitea_webhook_id, nil) if result.status == 204
+        end
       end
     end