From 33ec213f258116de8a67f85daa60bec9f3dc757f Mon Sep 17 00:00:00 2001 From: Marcin Kuzminski Date: Wed, 1 Feb 2017 12:11:01 +0100 Subject: [PATCH] merge-checks: show only username for allowed to merge check. --- rhodecode/model/pull_request.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rhodecode/model/pull_request.py b/rhodecode/model/pull_request.py index d58efcff..682f8be2 100644 --- a/rhodecode/model/pull_request.py +++ b/rhodecode/model/pull_request.py @@ -1361,7 +1361,7 @@ class MergeCheck(object): if not user_allowed_to_merge: log.debug("MergeCheck: cannot merge, approval is pending.") - msg = _('User `{}` not allowed to perform merge').format(user) + msg = _('User `{}` not allowed to perform merge.').format(user.username) merge_check.push_error('error', msg, cls.PERM_CHECK, user.username) if fail_early: return merge_check