diff --git a/pagure/ui/fork.py b/pagure/ui/fork.py index 4ffa9e4..51375de 100644 --- a/pagure/ui/fork.py +++ b/pagure/ui/fork.py @@ -43,8 +43,8 @@ def _get_parent_repo_path(repo): return parentpath -@APP.route('//request-pulls') -@APP.route('/fork///request-pulls') +@APP.route('//pull-requests') +@APP.route('/fork///pull-requests') def request_pulls(repo, username=None): """ Request pulling the changes from the fork into the project. """ @@ -72,8 +72,8 @@ def request_pulls(repo, username=None): ) -@APP.route('//request-pull/') -@APP.route('/fork///request-pull/') +@APP.route('//pull-request/') +@APP.route('/fork///pull-request/') def request_pull(repo, requestid, username=None): """ Request pulling the changes from the fork into the project. """ @@ -176,8 +176,8 @@ def request_pull(repo, requestid, username=None): ) -@APP.route('//request-pull/.patch') -@APP.route('/fork///request-pull/.patch') +@APP.route('//pull-request/.patch') +@APP.route('/fork///pull-request/.patch') def request_pull_patch(repo, requestid, username=None): """ Returns the commits from the specified pull-request as patches. """ @@ -245,13 +245,13 @@ def request_pull_patch(repo, requestid, username=None): return flask.Response(patch, content_type="text/plain;charset=UTF-8") -@APP.route('//request-pull//comment/', +@APP.route('//pull-request//comment/', methods=['POST']) -@APP.route('//request-pull//comment//' +@APP.route('//pull-request//comment//' '/', methods=('GET', 'POST')) -@APP.route('/fork///request-pull//comment/', +@APP.route('/fork///pull-request//comment/', methods=['POST']) -@APP.route('/fork///request-pull//comment/' +@APP.route('/fork///pull-request//comment/' '//', methods=('GET', 'POST')) def pull_request_add_comment( repo, requestid, commit=None, @@ -314,8 +314,8 @@ def pull_request_add_comment( ) -@APP.route('//request-pull//merge', methods=['POST']) -@APP.route('/fork///request-pull//merge', +@APP.route('//pull-request//merge', methods=['POST']) +@APP.route('/fork///pull-request//merge', methods=['POST']) def merge_request_pull(repo, requestid, username=None): """ Request pulling the changes from the fork into the project. @@ -459,9 +459,9 @@ def merge_request_pull(repo, requestid, username=None): return flask.redirect(flask.url_for('view_repo', repo=repo.name)) -@APP.route('//request-pull/cancel/', +@APP.route('//pull-request/cancel/', methods=['POST']) -@APP.route('/fork///request-pull/cancel/', +@APP.route('/fork///pull-request/cancel/', methods=['POST']) def cancel_request_pull(repo, requestid, username=None): """ Cancel request pulling request.