diff --git a/progit/templates/pull_request.html b/progit/templates/pull_request.html index 4bbb9a3..a4bc08c 100644 --- a/progit/templates/pull_request.html +++ b/progit/templates/pull_request.html @@ -1,11 +1,11 @@ -{% extends "master.html" %} +{% extends "repo_master.html" %} {% from "_formhelper.html" import render_field_in_row %} {% block title %}Home{% endblock %} {%block tag %}home{% endblock %} -{% block content %} +{% block repo %}

Request pull {% if '/fork/' in request.url %} @@ -30,6 +30,21 @@ {% if request %}

Title: {{ request.title }}

+ {% if request.status %} + + {% if '/fork/' in request.url %} + + {% else %} + + {% endif %} + Merge + + + {% else %} + Merged + {% endif %} {% endif %}