diff --git a/progit/fork.py b/progit/fork.py index 9227d14..5b3fbde 100644 --- a/progit/fork.py +++ b/progit/fork.py @@ -127,6 +127,7 @@ def request_pull(repo, requestid, username=None): repo=repo, username=username, request=request, + repo_admin=is_repo_admin(request.repo), repo_obj=repo_obj, orig_repo=orig_repo, diff_commits=diff_commits, diff --git a/progit/templates/pull_request.html b/progit/templates/pull_request.html index 07b2e79..10763e1 100644 --- a/progit/templates/pull_request.html +++ b/progit/templates/pull_request.html @@ -20,14 +20,14 @@ {% if request %}

Title: {{ request.title }}

- {% if request.status %} + {% if request.status and repo_admin%} Merge - {% elif not form %} + {% elif not request.status %} Merged {% endif %} {% endif %}