diff --git a/runbot_merge/models/commands.py b/runbot_merge/models/commands.py index 675d71eb..fdee31c6 100644 --- a/runbot_merge/models/commands.py +++ b/runbot_merge/models/commands.py @@ -269,7 +269,7 @@ class Parser: if handler: yield handler(self) elif '!' in token: - raise CommandError("skill issue, noob") + raise CommandError("no need to scream") else: raise CommandError(f"unknown command {token!r}") diff --git a/runbot_merge/models/pull_requests.py b/runbot_merge/models/pull_requests.py index ea55d03b..2901def0 100644 --- a/runbot_merge/models/pull_requests.py +++ b/runbot_merge/models/pull_requests.py @@ -947,7 +947,7 @@ For your own safety I've ignored *everything in your entire comment*. msg = "you can't set a forward-port limit." # NO! case _: - msg = f"you can't {command}. Skill issue." + msg = f"you can't {command}." if msg is not None: rejections.append(msg) diff --git a/runbot_merge/tests/test_basic.py b/runbot_merge/tests/test_basic.py index a68d70f8..18d75d73 100644 --- a/runbot_merge/tests/test_basic.py +++ b/runbot_merge/tests/test_basic.py @@ -3158,7 +3158,7 @@ class TestReviewing: assert prx.comments == [ (users['reviewer'], 'hansen r+'), seen(env, prx, users), - (users['user'], "@{} you can't review+. Skill issue.".format(users['reviewer'])), + (users['user'], "@{} you can't review+.".format(users['reviewer'])), ] def test_self_review_success(self, env, repo, users, config):