Show More
@@ -1361,7 +1361,7 b' class MergeCheck(object):' | |||||
1361 | if not user_allowed_to_merge: |
|
1361 | if not user_allowed_to_merge: | |
1362 | log.debug("MergeCheck: cannot merge, approval is pending.") |
|
1362 | log.debug("MergeCheck: cannot merge, approval is pending.") | |
1363 |
|
1363 | |||
1364 | msg = _('User `{}` not allowed to perform merge').format(user) |
|
1364 | msg = _('User `{}` not allowed to perform merge.').format(user.username) | |
1365 | merge_check.push_error('error', msg, cls.PERM_CHECK, user.username) |
|
1365 | merge_check.push_error('error', msg, cls.PERM_CHECK, user.username) | |
1366 | if fail_early: |
|
1366 | if fail_early: | |
1367 | return merge_check |
|
1367 | return merge_check |
General Comments 0
You need to be logged in to leave comments.
Login now