diff --git a/pagure/lib/notify.py b/pagure/lib/notify.py index 03520c4..d0ebed5 100644 --- a/pagure/lib/notify.py +++ b/pagure/lib/notify.py @@ -804,14 +804,15 @@ Reopened pull-request: ) -def notify_cancelled_pull_request(request, user): +def notify_closed_pull_request(request, user): """ Notify the people following a project that a pull-request was - cancelled in it. + closed in it. """ text = """ -%s canceled a pull-request against the project: `%s` that you are following. +%s closed without merging a pull-request against the project: `%s` that you +are following. -Cancelled pull-request: +Closed pull-request: `` %s diff --git a/pagure/lib/query.py b/pagure/lib/query.py index 7abbd8f..118e59a 100644 --- a/pagure/lib/query.py +++ b/pagure/lib/query.py @@ -3270,7 +3270,7 @@ def close_pull_request(session, request, user, merged=True): if merged is True: pagure.lib.notify.notify_merge_pull_request(request, user_obj) else: - pagure.lib.notify.notify_cancelled_pull_request(request, user_obj) + pagure.lib.notify.notify_closed_pull_request(request, user_obj) pagure.lib.git.update_git(request, repo=request.project) diff --git a/pagure/templates/repo_pull_request.html b/pagure/templates/repo_pull_request.html index 78f5358..2f1bef1 100644 --- a/pagure/templates/repo_pull_request.html +++ b/pagure/templates/repo_pull_request.html @@ -71,7 +71,7 @@ by {{ pull_request.user.user }}. {% elif pull_request.status == 'Closed' %} - Cancelled {{ pull_request.closed_at |humanize }} + Closed {{ pull_request.closed_at |humanize }} by {{ pull_request.closed_by.user }}. @@ -150,7 +150,7 @@ {% endif %}