fix: resolve merge conflicts in ticket_whitelist, add retry logic for port 5001 in bug_report, and implement live GitLab issue deduplication in logger
This commit is contained in:
parent
c40c3f1f12
commit
16263d88bc
6 changed files with 525 additions and 54 deletions
|
|
@ -1,6 +1,118 @@
|
|||
[
|
||||
{
|
||||
<<<<<<< Updated upstream
|
||||
"date": "2026-03-15T15:50:47.091919+00:00",
|
||||
=======
|
||||
"date": "2026-03-28T20:17:38.126055+00:00",
|
||||
"trigger": "auto",
|
||||
"serversCount": 1,
|
||||
"membersCount": 12,
|
||||
"guildName": "Omega Kube Bêta Test",
|
||||
"errors": [],
|
||||
"success": true
|
||||
},
|
||||
{
|
||||
"date": "2026-03-28T20:17:08.105930+00:00",
|
||||
"trigger": "auto",
|
||||
"serversCount": 1,
|
||||
"membersCount": 12,
|
||||
"guildName": "Omega Kube Bêta Test",
|
||||
"errors": [],
|
||||
"success": true
|
||||
},
|
||||
{
|
||||
"date": "2026-03-28T20:16:37.851812+00:00",
|
||||
"trigger": "auto",
|
||||
"serversCount": 1,
|
||||
"membersCount": 12,
|
||||
"guildName": "Omega Kube Bêta Test",
|
||||
"errors": [],
|
||||
"success": true
|
||||
},
|
||||
{
|
||||
"date": "2026-03-28T20:16:08.471789+00:00",
|
||||
"trigger": "auto",
|
||||
"serversCount": 1,
|
||||
"membersCount": 12,
|
||||
"guildName": "Omega Kube Bêta Test",
|
||||
"errors": [],
|
||||
"success": true
|
||||
},
|
||||
{
|
||||
"date": "2026-03-28T20:15:38.321159+00:00",
|
||||
"trigger": "auto",
|
||||
"serversCount": 1,
|
||||
"membersCount": 12,
|
||||
"guildName": "Omega Kube Bêta Test",
|
||||
"errors": [],
|
||||
"success": true
|
||||
},
|
||||
{
|
||||
"date": "2026-03-28T20:15:08.114852+00:00",
|
||||
"trigger": "auto",
|
||||
"serversCount": 1,
|
||||
"membersCount": 12,
|
||||
"guildName": "Omega Kube Bêta Test",
|
||||
"errors": [],
|
||||
"success": true
|
||||
},
|
||||
{
|
||||
"date": "2026-03-28T20:14:38.114389+00:00",
|
||||
"trigger": "auto",
|
||||
"serversCount": 1,
|
||||
"membersCount": 12,
|
||||
"guildName": "Omega Kube Bêta Test",
|
||||
"errors": [],
|
||||
"success": true
|
||||
},
|
||||
{
|
||||
"date": "2026-03-28T20:14:07.816703+00:00",
|
||||
"trigger": "auto",
|
||||
"serversCount": 1,
|
||||
"membersCount": 12,
|
||||
"guildName": "Omega Kube Bêta Test",
|
||||
"errors": [],
|
||||
"success": true
|
||||
},
|
||||
{
|
||||
"date": "2026-03-28T20:13:37.862896+00:00",
|
||||
"trigger": "auto",
|
||||
"serversCount": 1,
|
||||
"membersCount": 12,
|
||||
"guildName": "Omega Kube Bêta Test",
|
||||
"errors": [],
|
||||
"success": true
|
||||
},
|
||||
{
|
||||
"date": "2026-03-28T20:13:07.844778+00:00",
|
||||
"trigger": "auto",
|
||||
"serversCount": 1,
|
||||
"membersCount": 12,
|
||||
"guildName": "Omega Kube Bêta Test",
|
||||
"errors": [],
|
||||
"success": true
|
||||
},
|
||||
{
|
||||
"date": "2026-03-28T20:12:37.876620+00:00",
|
||||
"trigger": "auto",
|
||||
"serversCount": 1,
|
||||
"membersCount": 12,
|
||||
"guildName": "Omega Kube Bêta Test",
|
||||
"errors": [],
|
||||
"success": true
|
||||
},
|
||||
{
|
||||
"date": "2026-03-28T20:12:08.173233+00:00",
|
||||
"trigger": "auto",
|
||||
"serversCount": 1,
|
||||
"membersCount": 12,
|
||||
"guildName": "Omega Kube Bêta Test",
|
||||
"errors": [],
|
||||
"success": true
|
||||
},
|
||||
{
|
||||
"date": "2026-03-01T00:26:14.746054+00:00",
|
||||
>>>>>>> Stashed changes
|
||||
"trigger": "auto",
|
||||
"serversCount": 1,
|
||||
"membersCount": 13,
|
||||
|
|
@ -70,6 +182,7 @@
|
|||
"guildName": "Omega Kube Bêta Test",
|
||||
"errors": [],
|
||||
"success": true
|
||||
<<<<<<< Updated upstream
|
||||
},
|
||||
{
|
||||
"date": "2026-03-15T15:46:47.376868+00:00",
|
||||
|
|
@ -178,5 +291,7 @@
|
|||
"guildName": "Omega Kube Bêta Test",
|
||||
"errors": [],
|
||||
"success": true
|
||||
=======
|
||||
>>>>>>> Stashed changes
|
||||
}
|
||||
]
|
||||
Loading…
Add table
Add a link
Reference in a new issue