Parent: [ce1c94] (diff)

Child: [415aec] (diff)

Download this file

merge_request.html    36 lines (28 with data), 909 Bytes

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
{% extends 'repo/repo_master.html' %}
{% block title %}
{% if c.app.repo %}
Repository: {{c.app.repo.name}}
{% else %}
Repository
{% endif %}
{% endblock %}
{% block header %}{{c.app.config.options.mount_label}}
Merge Request #{{req.request_number}}: {{req.summary}}
{% endblock %}
{% block content %}
{{ clone_info(c.app.repo) }}
<p>
<a href="{{req.creator_url}}">{{req.creator_name}}</a>
would like you to merge {{ req.commits | count }} commits
from <a href="{{req.downstream_url}}">{{req.downstream_url}}</a>
to {{ req.target_branch }}
</p>
<p>To merge the commits, please execute the following commands in your working
copy: </p>
<textarea
style="width:80%"
readonly
>{{ c.app.repo.merge_command(req) | safe }}</textarea>
<div>{{g.markdown.convert(req.description)}}</div>
{{ c.log_widget.display(value=req.commits) }}
{% endblock %}