diff --git a/progit/fork.py b/progit/fork.py index 477bd68..60737e2 100644 --- a/progit/fork.py +++ b/progit/fork.py @@ -532,7 +532,7 @@ def fork_edit_issue(username, repo, issueid): @APP.route('/fork///request-pull') @APP.route('/fork///request-pull/') -def request_pull_fork(username, repo, commitid=None): +def request_pull(username, repo, commitid=None): """ Request pulling the changes from the fork into the project. """ repo = progit.lib.get_project(SESSION, repo, user=username) diff --git a/progit/templates/repo_info.html b/progit/templates/repo_info.html index adf2695..33151c9 100644 --- a/progit/templates/repo_info.html +++ b/progit/templates/repo_info.html @@ -103,7 +103,7 @@ {% endif %} {% if diff_commits %} - Request pull {% endif %} @@ -123,7 +123,7 @@ {{ commit.message.split('\n')[0] }} {% if diff_commits and commit.oid.hex in diff_commits %} * - (Request pull) {% endif %}