From bad8e4ada1f55846d194a53de3291482197859a6 Mon Sep 17 00:00:00 2001 From: Johan Cwiklinski Date: Oct 13 2014 07:00:20 +0000 Subject: Fix typos --- diff --git a/progit/templates/pull_request.html b/progit/templates/pull_request.html index 9e37b99..08ab422 100644 --- a/progit/templates/pull_request.html +++ b/progit/templates/pull_request.html @@ -157,7 +157,7 @@ ); $('#cancel_pr').click(function(){ - return window.confirm("Are you sure you want to cancel requested pull?"); + return window.confirm("Are you sure you want to cancel this requested pull?"); }); }); diff --git a/progit/ui/fork.py b/progit/ui/fork.py index 795c797..d198691 100644 --- a/progit/ui/fork.py +++ b/progit/ui/fork.py @@ -402,7 +402,7 @@ def cancel_request_pull(repo, requestid, username=None): if not is_repo_admin(repo): flask.abort( 403, - 'You are not allowed to merge pull-request for this project') + 'You are not allowed to cancel pull-request for this project') progit.lib.close_pull_request(SESSION, request, merged=False) SESSION.commit()