honeymoose
/
angular-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ci: update github bot messages (#21634) 

Fixes #21633
PR Close #21634
This commit is contained in:
Olivier Combe 2018-01-18 17:41:07 +01:00 committed by Miško Hevery
parent 7f93aad836
commit 2b4f3004ac
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/angular-robot.yml vendored
View File

@ -14,8 +14,8 @@ merge:
failureText: "The following checks are failing:" failureText: "The following checks are failing:"
# comment that will be added to a PR when there is a conflict, leave empty or set to false to disable # comment that will be added to a PR when there is a conflict, leave empty or set to false to disable
mergeConflictComment: "Hello? Don't want to hassle you. Sure you're busy. But this PR has some merge conflicts that you probably ought to resolve. mergeConflictComment: "Hi @{{PRAuthor}}! This PR has merge conflicts due to recent upstream merges.
\nThat is... if you want it to be merged someday..." \nPlease help to unblock it by resolving these conflicts. Thanks!"
# label to monitor # label to monitor
mergeLabel: "PR action: merge" mergeLabel: "PR action: merge"
@ -44,7 +44,7 @@ merge:
# the comment that will be added when the merge label is added despite failing checks, leave empty or set to false to disable # the comment that will be added when the merge label is added despite failing checks, leave empty or set to false to disable
# {{MERGE_LABEL}} will be replaced by the value of the mergeLabel option # {{MERGE_LABEL}} will be replaced by the value of the mergeLabel option
# {{PLACEHOLDER}} will be replaced by the list of failing checks # {{PLACEHOLDER}} will be replaced by the list of failing checks
mergeRemovedComment: "I see that you just added the `{{MERGE_LABEL}}` label. It won't do anything good though, because the following checks are still failing: mergeRemovedComment: "I see that you just added the `{{MERGE_LABEL}}` label, but the following checks are still failing:
\n{{PLACEHOLDER}} \n{{PLACEHOLDER}}
\n \n
\n**If you want your PR to be merged, it has to pass all the CI checks.** \n**If you want your PR to be merged, it has to pass all the CI checks.**