Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat：工蜂 MR 触发增加 action=edit #11024 #11038

Merged
merged 2 commits into from
Oct 18, 2024
Merged

feat：工蜂 MR 触发增加 action=edit #11024 #11038

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ab84bb
feat：工蜂 MR 触发增加 action=edit #11024
hejieehe Oct 8, 2024
56dc96c
feat：工蜂 MR 触发增加 action=edit #11024
hejieehe Oct 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/backend/ci/core/common/common-pipeline-yaml/src/main/resources/schema/V3_0/ci.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@
"type" : "array",
"uniqueItems" : true,
"items" : {
"enum" : [ "open", "close", "reopen", "push-update", "merge" ]
"enum" : [ "open", "close", "reopen", "push-update", "merge", "edit" ]
},
"additionalItems" : false
},
Expand Down Expand Up @@ -904,7 +904,7 @@
"type" : "array",
"uniqueItems" : true,
"items" : {
"enum" : [ "open", "close", "reopen", "push-update", "merge" ]
"enum" : [ "open", "close", "reopen", "push-update", "merge", "edit" ]
},
"additionalItems" : false
},
Expand Down
5 changes: 3 additions & 2 deletions ...ok/src/main/kotlin/com/tencent/devops/common/webhook/enums/code/tgit/TGitMrEventAction.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ enum class TGitMrEventAction(val value: String) {
CLOSE("close"),
REOPEN("reopen"),
PUSH_UPDATE("push-update"),
MERGE("merge");
MERGE("merge"),
EDIT("edit");

companion object {
fun getActionValue(event: GitMergeRequestEvent): String? {
Expand All @@ -51,7 +52,7 @@ enum class TGitMrEventAction(val value: String) {
if (event.object_attributes.extension_action == TGitMergeExtensionActionKind.PUSH_UPDATE.value) {
PUSH_UPDATE.value
} else {
null
EDIT.value
}
}
TGitMergeActionKind.MERGE.value -> MERGE.value
Expand Down
2 changes: 1 addition & 1 deletion support-files/i18n/process/message_en_US.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,7 @@ bkTgitIssueUpdatedEventDesc=Issue [<a href="{0}" target="_blank">!{1}</a>] updat
bkTgitIssueClosedEventDesc=Issue [<a href="{0}" target="_blank">!{1}</a>] closed by <span class="trigger-user">{2}</span>
bkTgitIssueReopenedEventDesc=Issue [<a href="{0}" target="_blank">!{1}</a>] reopened by <span class="trigger-user">{2}</span>
bkTgitMrCreatedEventDesc=Merge requests [<a href="{0}" target="_blank">!{1}</a>] opened by <span class="trigger-user">{2}</span>
bkTgitMrUpdatedEventDesc=Merge requests [<a href="{0}" target="_blank">!{1}</a>] updated by <span class="trigger-user">{2}</span>
bkTgitMrUpdatedEventDesc=Merge requests [<a href="{0}" target="_blank">!{1}</a>] edited by <span class="trigger-user">{2}</span>
bkTgitMrClosedEventDesc=Merge requests [<a href="{0}" target="_blank">!{1}</a>] closed by <span class="trigger-user">{2}</span>
bkTgitMrReopenedEventDesc=Merge requests [<a href="{0}" target="_blank">!{1}</a>] reopened by <span class="trigger-user">{2}</span>
bkTgitMrPushUpdatedEventDesc=Merge requests [<a href="{0}" target="_blank">!{1}</a>] push updated by <span class="trigger-user">{2}</span>
Expand Down
2 changes: 1 addition & 1 deletion support-files/i18n/process/message_zh_CN.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,7 @@ bkTgitIssueUpdatedEventDesc=议题 [<a href="{0}" target="_blank">!{1}</a>] 由
bkTgitIssueClosedEventDesc=议题 [<a href="{0}" target="_blank">!{1}</a>] 由 <span class="trigger-user">{2}</span> 关闭
bkTgitIssueReopenedEventDesc=议题 [<a href="{0}" target="_blank">!{1}</a>] 由 <span class="trigger-user">{2}</span> 重新打开
bkTgitMrCreatedEventDesc=合并请求 [<a href="{0}" target="_blank">!{1}</a>] 由 <span class="trigger-user">{2}</span> 创建
bkTgitMrUpdatedEventDesc=合并请求 [<a href="{0}" target="_blank">!{1}</a>] 由 <span class="trigger-user">{2}</span> 更新
bkTgitMrUpdatedEventDesc=合并请求 [<a href="{0}" target="_blank">!{1}</a>] 由 <span class="trigger-user">{2}</span> 编辑
bkTgitMrClosedEventDesc=合并请求 [<a href="{0}" target="_blank">!{1}</a>] 由 <span class="trigger-user">{2}</span> 关闭
bkTgitMrReopenedEventDesc=合并请求 [<a href="{0}" target="_blank">!{1}</a>] 由 <span class="trigger-user">{2}</span> 重新打开
bkTgitMrPushUpdatedEventDesc=合并请求 [<a href="{0}" target="_blank">!{1}</a>] 由 <span class="trigger-user">{2}</span> 在源分支提交代码触发
Expand Down
Loading
Loading