{#- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. -#} {% extends 'allura:templates/repo/repo_master.html' %} {% block title %} {{c.project.name}} / {{c.app.config.options.mount_label}} / Merge Request #{{req.request_number}}: {{req.summary}} ({{req.status}}) {% endblock %} {% block header %}{{c.app.config.options.mount_label}} Merge Request #{{req.request_number}}: {{req.summary}} ({{req.status}}) {% endblock %} {% block actions %} {% if c.user and c.user != c.user.anonymous() %} {{ c.subscribe_form.display(value=subscribed, action='subscribe', style='icon') }} {% endif %} {% if h.has_access(req, 'write') %} {{ g.icons['edit'].render(href='edit', show_title=True) }} {% endif %} {% endblock %} {% block content %}
{% if merge_status == 'complete' %}

Merged

{% else %}

Merging...

Merged

Something went wrong. Please, merge manually

{% endif %}
{% if can_merge_status != 'complete' %}

Checking if merge is possible...

Something went wrong. Please, merge manually

{% endif %}
{% if req.downstream_repo %}

{{req.creator_name}} wants to merge {{h.text.plural(commits|count, 'commit', 'commits')}} from {{req.downstream_url}} to {{ req.target_branch }}, {{lib.abbr_date(req.mod_date)}}

{{g.markdown.convert(req.description)}} {% if error %}
Can't find commits to merge. Please checkout {{req.downstream_url}} and follow the instructions to merge manually.
{% endif %} {% if req.merge_allowed(c.user) %}
Checking if merge is possible...
Merge request has no conflicts. You can merge automatically.
Merge request has conflicts. Follow manual instructions below to merge.
{% endif %}
{% if req.merge_allowed(c.user) %}
{{ lib.csrf_token() }}
{% endif %} {% if req.creator == c.user and req.status == "open" %}
{{ lib.csrf_token() }}
{{ lib.csrf_token() }}
{% endif %}
{% if commits_task_started %}

Determining commits...

{% else %} {{ c.log_widget.display(value=commits, app=downstream_app) }} {% endif %} {% if h.has_access(c.app, 'write') %}
To merge the commits, please execute the following commands in your working copy:
{% if merge_status not in ('ready', 'busy') %} {{ c.mr_dispose_form.display(action="save", value=dict(status=req.status)) }}
{% endif %} {% endif %} {% else %}

Original repository by {{req.creator_name}} is deleted

{{g.markdown.convert(req.description)}}
{% if h.has_access(c.app, 'write') %} {{ c.mr_dispose_form.display(action="save", value=dict(status=req.status)) }}
{% endif %} {% endif %} {% endblock %} {% block after_content %}

Discussion

{% set thread=req.discussion_thread %} {{c.thread.display( value=thread, new_post_text="New Comment", page=page, limit=limit, count=count)}}
{% endblock %} {% block extra_css %} {{ super() }} {% endblock %} {% block extra_js %} {{ super() }} {% endblock %}