From 57268f256488efed4efa5c001eae18c8a2d3e2fd Mon Sep 17 00:00:00 2001 From: Marcin Kuzminski Date: Thu, 19 Jan 2017 14:04:19 +0100 Subject: [PATCH] merge-logic: improve merge failed because of conflicts message. --- rhodecode/model/pull_request.py | 2 +- rhodecode/tests/models/test_pullrequest.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rhodecode/model/pull_request.py b/rhodecode/model/pull_request.py index 17e4ab40..86dbdf3a 100644 --- a/rhodecode/model/pull_request.py +++ b/rhodecode/model/pull_request.py @@ -80,7 +80,7 @@ class PullRequestModel(BaseModel): 'This pull request cannot be merged because of an unhandled' ' exception.'), MergeFailureReason.MERGE_FAILED: lazy_ugettext( - 'This pull request cannot be merged because of conflicts.'), + 'This pull request cannot be merged because of merge conflicts.'), MergeFailureReason.PUSH_FAILED: lazy_ugettext( 'This pull request could not be merged because push to target' ' failed.'), diff --git a/rhodecode/tests/models/test_pullrequest.py b/rhodecode/tests/models/test_pullrequest.py index f53295a9..5a272492 100644 --- a/rhodecode/tests/models/test_pullrequest.py +++ b/rhodecode/tests/models/test_pullrequest.py @@ -183,7 +183,7 @@ class TestPullRequestModel: assert status is False assert ( msg.eval() == - 'This pull request cannot be merged because of conflicts.') + 'This pull request cannot be merged because of merge conflicts.') self.merge_mock.assert_called_once_with( pull_request.target_ref_parts, pull_request.source_repo.scm_instance(), @@ -200,7 +200,7 @@ class TestPullRequestModel: assert status is False assert ( msg.eval() == - 'This pull request cannot be merged because of conflicts.') + 'This pull request cannot be merged because of merge conflicts.') assert self.merge_mock.called is False def test_merge_status_unknown_failure(self, pull_request):