# HG changeset patch # User Martin Bornhold # Date 2016-10-26 13:43:44 # Node ID 9a3ec87d76e30642bb4c1bd06e9a4e6f6f24fb41 # Parent 6613f04bd3c8cff50e0aed356b699e0112ecb139 pr: Add error messages for new merge failure reasons. diff --git a/rhodecode/model/pull_request.py b/rhodecode/model/pull_request.py --- a/rhodecode/model/pull_request.py +++ b/rhodecode/model/pull_request.py @@ -92,6 +92,12 @@ class PullRequestModel(BaseModel): MergeFailureReason.MISSING_COMMIT: lazy_ugettext( 'This pull request cannot be merged because the target or the ' 'source reference is missing.'), + MergeFailureReason.MISSING_TARGET_REF: lazy_ugettext( + 'This pull request cannot be merged because the target ' + 'reference is missing.'), + MergeFailureReason.MISSING_SOURCE_REF: lazy_ugettext( + 'This pull request cannot be merged because the source ' + 'reference is missing.'), } def __get_pull_request(self, pull_request):