This is an automated email from the ASF dual-hosted git repository.

warren pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git

commit 914ba3e75cd244cf2881c02fc567aee30c7077fe
Author: Nddtfjiang <[email protected]>
AuthorDate: Wed May 18 14:33:40 2022 +0000

    fix: fix jira connection
    
    fix db delete name for jira connection.
    
    Nddtfjiang <[email protected]>
---
 plugins/jira/api/connection.go | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/plugins/jira/api/connection.go b/plugins/jira/api/connection.go
index b0951c7a..1aa64f3f 100644
--- a/plugins/jira/api/connection.go
+++ b/plugins/jira/api/connection.go
@@ -284,11 +284,7 @@ func DeleteConnection(input *core.ApiResourceInput) 
(*core.ApiResourceOutput, er
                return nil, err
        }
        // cascading delete
-<<<<<<< HEAD
        err = db.Where("id = ?", 
jiraConnectionID).Delete(&models.JiraConnection{}).Error
-=======
-       err = db.Where("connection_id = ?", 
jiraConnectionID).Delete(&models.JiraConnection{}).Error
->>>>>>> fix: delete jira connect without decrypt
        if err != nil {
                return nil, err
        }

Reply via email to