|
Pierre-Yves Chibon |
706f31 |
{% extends "repo_master.html" %}
|
|
Pierre-Yves Chibon |
7732a9 |
{% from "_formhelper.html" import render_field_in_row %}
|
|
Pierre-Yves Chibon |
006f93 |
|
|
Pierre-Yves Chibon |
1a7791 |
{% block title %}Pull request #{{ request.id }} - {{ repo.name }}{% endblock %}
|
|
Pierre-Yves Chibon |
006f93 |
{%block tag %}home{% endblock %}
|
|
Pierre-Yves Chibon |
006f93 |
|
|
Pierre-Yves Chibon |
006f93 |
|
|
Pierre-Yves Chibon |
706f31 |
{% block repo %}
|
|
Pierre-Yves Chibon |
006f93 |
|
|
Pierre-Yves Chibon |
006f93 |
Request pull
|
|
Pierre-Yves Chibon |
ea8735 |
|
|
Pierre-Yves Chibon |
006f93 |
{{ repo.name }}
|
|
Pierre-Yves Chibon |
006f93 |
|
|
Pierre-Yves Chibon |
006f93 |
|
|
Pierre-Yves Chibon |
ea8735 |
(
|
|
Pierre-Yves Chibon |
006f93 |
repo=repo.name, identifier=commitid) }}"
|
|
Pierre-Yves Chibon |
006f93 |
>tree)
|
|
Pierre-Yves Chibon |
006f93 |
|
|
Pierre-Yves Chibon |
006f93 |
|
|
Pierre-Yves Chibon |
006f93 |
|
|
Pierre-Yves Chibon |
7732a9 |
{% if request %}
|
|
Pierre-Yves Chibon |
7732a9 |
Title: {{ request.title }}
|
|
Pierre-Yves Chibon |
840d94 |
{% if request.status and repo_admin %}
|
|
Pierre-Yves Chibon |
706f31 |
|
|
Pierre-Yves Chibon |
e580d4 |
|
|
Pierre-Yves Chibon |
038b0e |
repo=repo.name, requestid=requestid) }}" class="message">
|
|
Pierre-Yves Chibon |
e580d4 |
Merge
|
|
Pierre-Yves Chibon |
e580d4 |
|
|
Pierre-Yves Chibon |
706f31 |
|
|
Pierre-Yves Chibon |
840d94 |
{% elif request and request.status == False %}
|
|
Pierre-Yves Chibon |
706f31 |
Merged
|
|
Pierre-Yves Chibon |
706f31 |
{% endif %}
|
|
Pierre-Yves Chibon |
7732a9 |
{% endif %}
|
|
Pierre-Yves Chibon |
7732a9 |
|
|
Pierre-Yves Chibon |
006f93 |
<section class="commit_list"></section>
|
|
Pierre-Yves Chibon |
006f93 |
|
|
Pierre-Yves Chibon |
006f93 |
{% for commit in diff_commits %}
|
|
Pierre-Yves Chibon |
006f93 |
|
|
Pierre-Yves Chibon |
ea8735 |
|
|
Pierre-Yves Chibon |
006f93 |
repo=repo.name, commitid=commit.oid.hex)}}">
|
|
Pierre-Yves Chibon |
006f93 |
{{ commit.message.split('\n')[0] }}
|
|
Pierre-Yves Chibon |
006f93 |
|
|
Pierre-Yves Chibon |
006f93 |
|
|
Pierre-Yves Chibon |
006f93 |
{% endfor %}
|
|
Pierre-Yves Chibon |
006f93 |
|
|
Pierre-Yves Chibon |
006f93 |
|
|
Pierre-Yves Chibon |
006f93 |
|
|
Pierre-Yves Chibon |
7732a9 |
{% if form %}
|
|
Pierre-Yves Chibon |
7732a9 |
<section class="new_project"></section>
|
|
Pierre-Yves Chibon |
7732a9 |
|
|
Pierre-Yves Chibon |
7732a9 |
repo=repo.name, commitid=commitid) }}" method="post">
|
|
Pierre-Yves Chibon |
7732a9 |
|
|
Pierre-Yves Chibon |
7732a9 |
{{ render_field_in_row(form.title) }}
|
|
Pierre-Yves Chibon |
7732a9 |
|
|
Pierre-Yves Chibon |
7732a9 |
|
|
Pierre-Yves Chibon |
7732a9 |
<input class="submit positive button" type="submit" value="Create">
|
|
Pierre-Yves Chibon |
7732a9 |
<input class="button" onclick="history.back();" type="button" value="Cancel">
|
|
Pierre-Yves Chibon |
7732a9 |
{{ form.csrf_token }}
|
|
Pierre-Yves Chibon |
7732a9 |
|
|
Pierre-Yves Chibon |
7732a9 |
|
|
Pierre-Yves Chibon |
7732a9 |
|
|
Pierre-Yves Chibon |
7732a9 |
{% endif %}
|
|
Pierre-Yves Chibon |
7732a9 |
|
|
Pierre-Yves Chibon |
006f93 |
<section class="request_diff"></section>
|
|
Pierre-Yves Chibon |
006f93 |
Diff:
|
|
Pierre-Yves Chibon |
006f93 |
{% for html_diff in html_diffs %}
|
|
Pierre-Yves Chibon |
006f93 |
Commit: {{ diff_commits[loop.index - 1].oid.hex }}
|
|
Pierre-Yves Chibon |
006f93 |
|
|
Pierre-Yves Chibon |
006f93 |
|
|
Pierre-Yves Chibon |
006f93 |
|
|
Pierre-Yves Chibon |
006f93 |
Author
|
|
Pierre-Yves Chibon |
006f93 |
|
|
Pierre-Yves Chibon |
006f93 |
{{ diff_commits[loop.index - 1].author.name }} {{ '<' + diff_commits[loop.index - 1].author.email + '>' }}
|
|
Pierre-Yves Chibon |
006f93 |
- {{ diff_commits[loop.index - 1].commit_time }}
|
|
Pierre-Yves Chibon |
006f93 |
|
|
Pierre-Yves Chibon |
006f93 |
|
|
Pierre-Yves Chibon |
006f93 |
|
|
Pierre-Yves Chibon |
006f93 |
Committer
|
|
Pierre-Yves Chibon |
006f93 |
|
|
Pierre-Yves Chibon |
006f93 |
{{ diff_commits[loop.index - 1].committer.name }} {{ '<' + diff_commits[loop.index - 1].committer.email + '>' }}
|
|
Pierre-Yves Chibon |
006f93 |
- {{ diff_commits[loop.index - 1].commit_time }}
|
|
Pierre-Yves Chibon |
006f93 |
|
|
Pierre-Yves Chibon |
006f93 |
|
|
Pierre-Yves Chibon |
006f93 |
|
|
Pierre-Yves Chibon |
006f93 |
Parent
|
|
Pierre-Yves Chibon |
006f93 |
|
|
Pierre-Yves Chibon |
006f93 |
{% for parent in diff_commits[loop.index - 1].parents %}
|
|
Pierre-Yves Chibon |
ea8735 |
|
|
Pierre-Yves Chibon |
006f93 |
repo=repo.name, commitid=parent.oid.hex) }}">
|
|
Pierre-Yves Chibon |
006f93 |
|
|
Pierre-Yves Chibon |
006f93 |
{{ parent.oid.hex }}
|
|
Pierre-Yves Chibon |
006f93 |
|
|
Pierre-Yves Chibon |
006f93 |
{% endfor %}
|
|
Pierre-Yves Chibon |
006f93 |
|
|
Pierre-Yves Chibon |
006f93 |
|
|
Pierre-Yves Chibon |
006f93 |
|
|
Pierre-Yves Chibon |
006f93 |
|
|
Pierre-Yves Chibon |
006f93 |
{{ diff_commits[loop.index - 1].message }}
|
|
Pierre-Yves Chibon |
006f93 |
|
|
Pierre-Yves Chibon |
006f93 |
{% autoescape false %}
|
|
Pierre-Yves Chibon |
006f93 |
{{ html_diff }}
|
|
Pierre-Yves Chibon |
006f93 |
{% endautoescape %}
|
|
Pierre-Yves Chibon |
006f93 |
{% endfor %}
|
|
Pierre-Yves Chibon |
006f93 |
|
|
Pierre-Yves Chibon |
006f93 |
|
|
Pierre-Yves Chibon |
006f93 |
{% endblock %}
|