diff --git a/pagure/api/__init__.py b/pagure/api/__init__.py index 546eb1b..976c0e4 100644 --- a/pagure/api/__init__.py +++ b/pagure/api/__init__.py @@ -92,7 +92,7 @@ class APIERROR(enum.Enum): "necessary to be merged" ) EPRCONFLICTS = "This pull-request conflicts and thus cannot be merged" - ENOTASSIGNEE = "Only the assignee can merge this review" + ENOTASSIGNEE = "Only the assignee can merge this request" ENOTASSIGNED = "This request must be assigned to be merged" ENOUSER = "No such user found" ENOCOMMENT = "Comment not found" diff --git a/pagure/ui/fork.py b/pagure/ui/fork.py index ce43d23..18e68df 100644 --- a/pagure/ui/fork.py +++ b/pagure/ui/fork.py @@ -1115,7 +1115,7 @@ def merge_request_pull(repo, requestid, username=None, namespace=None): ) ) if request.assignee.username != flask.g.fas_user.username: - flask.flash("Only the assignee can merge this review", "error") + flask.flash("Only the assignee can merge this request", "error") return flask.redirect( flask.url_for( "ui_ns.request_pull", diff --git a/tests/test_pagure_flask_api_fork.py b/tests/test_pagure_flask_api_fork.py index 40ab890..8f1c9f3 100644 --- a/tests/test_pagure_flask_api_fork.py +++ b/tests/test_pagure_flask_api_fork.py @@ -1191,7 +1191,7 @@ class PagureFlaskApiForktests(tests.Modeltests): self.assertDictEqual( data, { - "error": "Only the assignee can merge this review", + "error": "Only the assignee can merge this request", "error_code": "ENOTASSIGNEE", }, ) diff --git a/tests/test_pagure_flask_ui_fork.py b/tests/test_pagure_flask_ui_fork.py index 0a95f39..2c6b8a1 100644 --- a/tests/test_pagure_flask_ui_fork.py +++ b/tests/test_pagure_flask_ui_fork.py @@ -702,7 +702,7 @@ class PagureFlaskForktests(tests.Modeltests): output_text, ) self.assertIn( - "Only the assignee can " "merge this review", output_text + "Only the assignee can merge this request", output_text ) # Project w/ minimal PR score