|
Pierre-Yves Chibon |
706f31 |
{% extends "repo_master.html" %}
|
|
Ryan Lerch |
2aa95c |
{% from "_formhelper.html" import show_comment, show_pr_initial_comment, render_bootstrap_field %}
|
|
Ryan Lerch |
a623af |
{% from "_repo_renderdiff.html" import repo_renderdiff %}
|
|
Pierre-Yves Chibon |
006f93 |
|
|
Pierre-Yves Chibon |
290724 |
{% block title %}
|
|
Pierre-Yves Chibon |
290724 |
{%- if pull_request -%}
|
|
Shengjing Zhu |
539c7f |
PR#{{ requestid }}: {{ pull_request.title | noJS(ignore="img") | safe }}
|
|
Pierre-Yves Chibon |
ff8880 |
{%- endif
|
|
Pierre-Yves Chibon |
2427e2 |
%} - {{ repo.url_path }}
|
|
Pierre-Yves Chibon |
290724 |
{% endblock %}
|
|
Pierre-Yves Chibon |
290724 |
|
|
Ryan Lerch |
f4adb4 |
{% set tag = "home" %}
|
|
Pierre-Yves Chibon |
006f93 |
|
|
Pierre-Yves Chibon |
2794db |
{% block header %}
|
|
Pierre-Yves Chibon |
3ff704 |
|
|
Pierre-Yves Chibon |
3ff704 |
url_for('static', filename='vendor/emojione/emojione.sprites.css') }}?version={{ g.version}}"/>
|
|
Pierre-Yves Chibon |
3ff704 |
|
|
Pierre-Yves Chibon |
3ff704 |
url_for('static', filename='vendor/selectize/selectize.bootstrap3.css') }}?version={{ g.version}}"/>
|
|
Pierre-Yves Chibon |
3ff704 |
|
|
Pierre-Yves Chibon |
3ff704 |
url_for('static', filename='vendor/jquery.atwho/jquery.atwho.css') }}?version={{ g.version}}"/>
|
|
Pierre-Yves Chibon |
2794db |
{% endblock %}
|
|
Pierre-Yves Chibon |
006f93 |
|
|
Pierre-Yves Chibon |
706f31 |
{% block repo %}
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
{% if pull_request.status == 'Open' %}
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
#{{requestid}}
|
|
Ryan Lerch |
2aa95c |
{% elif pull_request.status == 'Merged' %}
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
#{{requestid}}
|
|
Ryan Lerch |
2aa95c |
{% elif pull_request.status == 'Closed' %}
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
#{{requestid}}
|
|
Ryan Lerch |
2aa95c |
{% endif %}
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
{{ pull_request.title | noJS(ignore="img") | safe}}
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
{% if g.authenticated and (g.fas_user.username == pull_request.user.username
|
|
Ryan Lerch |
2aa95c |
or g.repo_committer) and pull_request.status == 'Open'%}
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
href="{{ url_for(
|
|
Ryan Lerch |
2aa95c |
'ui_ns.request_pull_edit',
|
|
Ryan Lerch |
2aa95c |
repo=repo.name,
|
|
Pierre-Yves Chibon |
04eb13 |
username=repo.user.user if repo.is_fork else None,
|
|
Ryan Lerch |
2aa95c |
namespace=repo.namespace,
|
|
Ryan Lerch |
2aa95c |
requestid=requestid) }}"
|
|
Ryan Lerch |
2aa95c |
title="Update title">
|
|
Ryan Lerch |
2aa95c |
{% endif %}
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
<small></small>
|
|
Ryan Lerch |
2aa95c |
{% if pull_request.status == 'Open' %}
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
Opened {{ pull_request.date_created |humanize }}
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
by {{ pull_request.user.user }}.
|
|
Pierre-Yves Chibon |
557a7a |
|
|
Pierre-Yves Chibon |
557a7a |
Modified {{ pull_request.updated_on |humanize }}
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
{% elif pull_request.status == 'Merged' %}
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
Merged {{ pull_request.closed_at |humanize }}
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
by
|
|
Slavek Kabrda |
b43582 |
{{ pull_request.closed_by.user }}.
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
Opened {{ pull_request.date_created |humanize }}
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
by {{ pull_request.user.user }}.
|
|
Ryan Lerch |
2aa95c |
{% elif pull_request.status == 'Closed' %}
|
|
Ryan Lerch |
2aa95c |
|
|
Pierre-Yves Chibon |
a35061 |
Closed {{ pull_request.closed_at |humanize }}
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
by
|
|
Slavek Kabrda |
b43582 |
{{ pull_request.closed_by.user }}.
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
Opened {{ pull_request.date_created |humanize }}
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
by {{ pull_request.user.user }}.
|
|
Ryan Lerch |
2aa95c |
{% endif %}
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
<small></small>
|
|
Julen Landa Alustiza |
38a4ae |
{% if pull_request.remote_git or (pull_request.project_from and pull_request.project_from.is_fork) %}
|
|
Pierre-Yves Chibon |
3ff704 |
|
|
Ryan Lerch |
2aa95c |
{% if pull_request.remote_git %}
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
{{pull_request.remote_git}}
|
|
Ryan Lerch |
2aa95c |
{% elif pull_request.project_from.is_fork %}
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
{% if pull_request.project_from.namespace %}
|
|
Ryan Lerch |
2aa95c |
{{pull_request.project_from.namespace}}/
|
|
Ryan Lerch |
2aa95c |
{% endif %}
|
|
Ryan Lerch |
2aa95c |
{% if pull_request.project_from.is_fork -%}
|
|
Ryan Lerch |
2aa95c |
{{ pull_request.project_from.user.user }}/
|
|
Ryan Lerch |
2aa95c |
{%- endif -%}
|
|
Ryan Lerch |
2aa95c |
{{pull_request.project_from.name}}
|
|
Pierre-Yves Chibon |
277586 |
{% endif %}
|
|
Julen Landa Alustiza |
38a4ae |
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
repo=pull_request.project_from.name,
|
|
Ryan Lerch |
2aa95c |
username=pull_request.project_from.user.user
|
|
Ryan Lerch |
2aa95c |
if pull_request.project_from.is_fork else None,
|
|
Ryan Lerch |
2aa95c |
namespace=repo.namespace,
|
|
Slavek Kabrda |
b0ee41 |
identifier=pull_request.branch_from)
|
|
Ryan Lerch |
2aa95c |
}}"
|
|
Pierre-Yves Chibon |
3ff704 |
class="badge badge-secondary badge-pill border border-secondary font-1em">
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
{{ pull_request.branch_from }}
|
|
Julen Landa Alustiza |
38a4ae |
|
|
Julen Landa Alustiza |
38a4ae |
{% else %}
|
|
Julen Landa Alustiza |
38a4ae |
|
|
Julen Landa Alustiza |
38a4ae |
|
|
Julen Landa Alustiza |
38a4ae |
Unknown source
|
|
Julen Landa Alustiza |
38a4ae |
|
|
Julen Landa Alustiza |
38a4ae |
{% endif %}
|
|
Ryan Lerch |
2aa95c |
into
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
repo=pull_request.project.name,
|
|
Ryan Lerch |
2aa95c |
username=pull_request.project.user.user
|
|
Ryan Lerch |
2aa95c |
if pull_request.project.is_fork else None,
|
|
Ryan Lerch |
2aa95c |
namespace=repo.namespace,
|
|
Slavek Kabrda |
b0ee41 |
identifier=pull_request.branch)
|
|
Ryan Lerch |
2aa95c |
}}"
|
|
Pierre-Yves Chibon |
3ff704 |
class="badge badge-secondary badge-pill border border-secondary font-1em">
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
{{ pull_request.branch }}
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
ae8410 |
|
|
Ryan Lerch |
2aa95c |
{% if g.authenticated and (g.fas_user.username == pull_request.user.username
|
|
Ryan Lerch |
2aa95c |
or g.repo_committer) and pull_request.status == 'Open'%}
|
|
Ryan Lerch |
2aa95c |
{% if pull_request.status == 'Open' and g.authenticated and
|
|
Ryan Lerch |
2aa95c |
(g.repo_committer or g.fas_user.username == pull_request.user.username) %}
|
|
Ryan Lerch |
2aa95c |
{% if mergeform and pull_request.remote %}
|
|
Pierre-Yves Chibon |
3ff704 |
|
|
Pierre-Yves Chibon |
04eb13 |
'ui_ns.refresh_request_pull',
|
|
Pierre-Yves Chibon |
04eb13 |
username=repo.user.user if repo.is_fork else None,
|
|
Ryan Lerch |
2aa95c |
namespace=repo.namespace,
|
|
Ryan Lerch |
2aa95c |
repo=repo.name, requestid=requestid) }}" method="POST">
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
class="btn btn-outline-primary btn-sm" title="Refresh the remote pull request">
|
|
Ryan Lerch |
2aa95c |
Refresh
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
{{ mergeform.csrf_token }}
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
{% endif %}
|
|
Pierre-Yves Chibon |
277586 |
|
|
Pierre-Yves Chibon |
3ff704 |
|
|
Pierre-Yves Chibon |
04eb13 |
'ui_ns.close_request_pull',
|
|
Pierre-Yves Chibon |
04eb13 |
username=repo.user.user if repo.is_fork else None,
|
|
Ryan Lerch |
2aa95c |
namespace=repo.namespace,
|
|
Ryan Lerch |
2aa95c |
repo=repo.name, requestid=requestid) }}" method="POST">
|
|
Ryan Lerch |
2aa95c |
{% endif %}
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
{% if pull_request.status == 'Open' and g.authenticated and
|
|
Ryan Lerch |
2aa95c |
(g.repo_committer or g.fas_user.username == pull_request.user.username) %}
|
|
Ryan Lerch |
2aa95c |
{{ mergeform.csrf_token }}
|
|
Pierre-Yves Chibon |
a35061 |
|
|
Ryan Lerch |
4a55f6 |
class="btn btn-outline-danger btn-sm" title="Close PR without merging it" data-toggle="tooltip">
|
|
Pierre-Yves Chibon |
a35061 |
Close
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
{% endif %}
|
|
Ryan Lerch |
2aa95c |
{% if pull_request.status == 'Open' and g.authenticated and
|
|
Ryan Lerch |
2aa95c |
(g.repo_committer or g.fas_user.username == pull_request.user.username) %}
|
|
Patrick Uiterwijk |
04c084 |
|
|
Pierre-Yves Chibon |
0d888c |
{% endif %}
|
|
Ryan Lerch |
2aa95c |
{% endif %}
|
|
Ryan Lerch |
2aa95c |
{% if pull_request.status == 'Open' %}
|
|
Ryan Lerch |
2aa95c |
|
|
Slavek Kabrda |
a80d7c |
|
|
Slavek Kabrda |
a80d7c |
|
|
Slavek Kabrda |
a80d7c |
class="btn btn-outline-secondary btn-sm disabled dropdown-toggle" data-toggle="dropdown">
|
|
Slavek Kabrda |
a80d7c |
Merge
|
|
Ryan Lerch |
2aa95c |
|
|
Pierre-Yves Chibon |
3ff704 |
|
|
Ryan Lerch |
2aa95c |
|
|
Julen Landa Alustiza |
898662 |
{% if pull_request.status == 'Open' and g.repo_committer %}
|
|
Slavek Kabrda |
a80d7c |
<small id="merge-alert-message"></small>
|
|
Slavek Kabrda |
a80d7c |
|
|
Slavek Kabrda |
a80d7c |
repo=repo.name,
|
|
Pierre-Yves Chibon |
04eb13 |
username=repo.user.user if repo.is_fork else None,
|
|
Slavek Kabrda |
a80d7c |
namespace=repo.namespace,
|
|
Slavek Kabrda |
a80d7c |
requestid=requestid)
|
|
Pierre-Yves Chibon |
8821f7 |
}}" method="POST" id="merge_pr_form">
|
|
Slavek Kabrda |
a80d7c |
{{ mergeform.csrf_token }}
|
|
Slavek Kabrda |
a80d7c |
|
|
Slavek Kabrda |
a80d7c |
class="btn btn-block my-2">Merge
|
|
Slavek Kabrda |
a80d7c |
{% if can_delete_branch %}
|
|
Slavek Kabrda |
a80d7c |
|
|
Slavek Kabrda |
a80d7c |
{{ mergeform.delete_branch }} {{ mergeform.delete_branch.label }}
|
|
Slavek Kabrda |
a80d7c |
|
|
Slavek Kabrda |
a80d7c |
{% endif %}
|
|
Slavek Kabrda |
a80d7c |
|
|
Julen Landa Alustiza |
898662 |
{% if pull_request.allow_rebase %}
|
|
Pierre-Yves Chibon |
2955bb |
|
|
Pierre-Yves Chibon |
2955bb |
class="btn btn-block my-2">Rebase
|
|
Julen Landa Alustiza |
898662 |
{% endif %}
|
|
Slavek Kabrda |
a80d7c |
{% else %}
|
|
Ryan Lerch |
2aa95c |
<small id="merge-alert-message"></small>
|
|
Slavek Kabrda |
a80d7c |
{% endif %}
|
|
Slavek Kabrda |
a80d7c |
|
|
Ryan Lerch |
2aa95c |
|
|
Slavek Kabrda |
a80d7c |
|
|
Slavek Kabrda |
a80d7c |
{% if g.authenticated and trigger_ci %}
|
|
Slavek Kabrda |
a80d7c |
|
|
Slavek Kabrda |
a80d7c |
|
|
Slavek Kabrda |
a80d7c |
class="btn btn-outline-primary btn-sm btn-info dropdown-toggle" data-toggle="dropdown">
|
|
Slavek Kabrda |
a80d7c |
Rerun CI
|
|
Slavek Kabrda |
a80d7c |
|
|
Slavek Kabrda |
a80d7c |
|
|
Slavek Kabrda |
a80d7c |
|
|
Slavek Kabrda |
a80d7c |
repo=repo.name,
|
|
Pierre-Yves Chibon |
04eb13 |
username=repo.username if repo.is_fork else None,
|
|
Slavek Kabrda |
a80d7c |
namespace=repo.namespace,
|
|
Slavek Kabrda |
a80d7c |
requestid=requestid)
|
|
Slavek Kabrda |
a80d7c |
}}" method="POST" id="ci_pr_trigger_form">
|
|
Slavek Kabrda |
a80d7c |
{{ trigger_ci_pr_form.csrf_token }}
|
|
Slavek Kabrda |
a80d7c |
{{ trigger_ci_pr_form.comment(id="ci_pr_comment", hidden=True) }}
|
|
Slavek Kabrda |
a80d7c |
{% for comment, meta in trigger_ci|dictsort %}
|
|
Pierre-Yves Chibon |
36de81 |
|
|
Pierre-Yves Chibon |
36de81 |
data-comment="{{ comment }}">{{ meta["name"] }}
|
|
Slavek Kabrda |
a80d7c |
{% endfor %}
|
|
Slavek Kabrda |
a80d7c |
|
|
Slavek Kabrda |
a80d7c |
|
|
Slavek Kabrda |
a80d7c |
|
|
Slavek Kabrda |
a80d7c |
{% endif %}
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
{% endif %}
|
|
Ryan Lerch |
2aa95c |
{% if pull_request.status == 'Closed' and g.authenticated and
|
|
Ryan Lerch |
2aa95c |
(g.repo_committer or g.fas_user.username == pull_request.user.username) %}
|
|
Ryan Lerch |
2aa95c |
|
|
Pierre-Yves Chibon |
04eb13 |
'ui_ns.reopen_request_pull',
|
|
Pierre-Yves Chibon |
04eb13 |
username=repo.user.user if repo.is_fork else None,
|
|
Pierre-Yves Chibon |
ff8880 |
namespace=repo.namespace,
|
|
Ryan Lerch |
6d1fc8 |
repo=repo.name, requestid=requestid) }}" method="POST">
|
|
Ryan Lerch |
2aa95c |
{{ mergeform.csrf_token }}
|
|
Ryan Lerch |
2aa95c |
|
|
Pierre-Yves Chibon |
277586 |
class="btn btn-sm btn-outline-danger" title="Reopen PR">
|
|
Pierre-Yves Chibon |
e3c816 |
Reopen Pull Request
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
6d1fc8 |
|
|
Ryan Lerch |
2aa95c |
{% endif %}
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
a1aaf1 |
|
|
Oliver Gutierrez |
38f510 |
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
|
|
Pierre-Yves Chibon |
7732a9 |
|
|
Pierre-Yves Chibon |
7732a9 |
|
|
Ryan Lerch |
2c259b |
|
|
Pierre-Yves Chibon |
a310ad |
|
|
Pierre-Yves Chibon |
a310ad |
|
|
Pierre-Yves Chibon |
a310ad |
Comments
|
|
Pierre-Yves Chibon |
a310ad |
|
|
Pierre-Yves Chibon |
a310ad |
|
|
Ryan Lerch |
ed0299 |
|
|
Pierre-Yves Chibon |
a310ad |
|
|
Pierre-Yves Chibon |
a310ad |
endif %}" data-toggle="tab" role="tab" href="#request_diff">
|
|
Abhijeet Kasurde |
8bdcee |
Files Changed
|
|
Ryan Lerch |
eef090 |
|
|
Pierre-Yves Chibon |
00b4f7 |
{{ diff|length if diff else 0}}
|
|
Ryan Lerch |
ed0299 |
|
|
Ryan Lerch |
ed0299 |
|
|
Ryan Lerch |
ed0299 |
|
|
Ryan Lerch |
ed0299 |
|
|
Ryan Lerch |
ed0299 |
|
|
Abhijeet Kasurde |
8bdcee |
Commits
|
|
Ryan Lerch |
eef090 |
|
|
Ryan Lerch |
ed0299 |
{{ diff_commits|length }}
|
|
Ryan Lerch |
ed0299 |
|
|
Ryan Lerch |
ed0299 |
|
|
Ryan Lerch |
ed0299 |
|
|
Ryan Lerch |
6d2e06 |
|
|
Pierre-Yves Chibon |
ff8880 |
|
|
Pierre-Yves Chibon |
b130e5 |
'ui_ns.request_pull_patch',
|
|
Pierre-Yves Chibon |
08a80b |
repo=repo.name,
|
|
Pierre-Yves Chibon |
04eb13 |
username=repo.user.user if repo.is_fork else None,
|
|
Pierre-Yves Chibon |
08a80b |
namespace=repo.namespace,
|
|
Pierre-Yves Chibon |
08a80b |
requestid=requestid) }}">
|
|
Ryan Lerch |
a38c4e |
Patch
|
|
Ryan Lerch |
a38c4e |
|
|
Ryan Lerch |
a38c4e |
|
|
Ryan Lerch |
ed0299 |
|
|
Ryan Lerch |
ed0299 |
|
|
Ryan Lerch |
ed0299 |
|
|
Ryan Lerch |
ed0299 |
|
|
Ryan Lerch |
ed0299 |
|
|
Ryan Lerch |
bc6d33 |
|
|
Pierre-Yves Chibon |
fac185 |
{% for commit in diff_commits %}
|
|
Ryan Lerch |
bc6d33 |
|
|
Julen Landa Alustiza |
38a4ae |
{% if pull_request.status and (pull_request.project_from and pull_request.project_from.is_fork) %}
|
|
Ryan Lerch |
2aa95c |
{% set commit_link = url_for(
|
|
Ryan Lerch |
2aa95c |
'ui_ns.view_commit',
|
|
Ryan Lerch |
2aa95c |
repo=pull_request.project_from.name,
|
|
Ryan Lerch |
2aa95c |
username=pull_request.project_from.user.user,
|
|
Ryan Lerch |
2aa95c |
namespace=repo.namespace,
|
|
Ryan Lerch |
2aa95c |
commitid=commit.oid.hex)%}
|
|
Ryan Lerch |
2aa95c |
{% set tree_link = url_for(
|
|
Ryan Lerch |
2aa95c |
'ui_ns.view_tree', username=pull_request.project_from.user.user, namespace=repo.namespace,
|
|
Ryan Lerch |
2aa95c |
repo=repo.name, identifier=commit.hex) %}
|
|
Ryan Lerch |
a623af |
{% elif pull_request.remote %}
|
|
Ryan Lerch |
2aa95c |
{% set commit_link = None %}
|
|
Pierre-Yves Chibon |
fac185 |
{% else %}
|
|
Ryan Lerch |
2aa95c |
{% set commit_link = url_for('ui_ns.view_commit',
|
|
Pierre-Yves Chibon |
08a80b |
repo=repo.name,
|
|
Pierre-Yves Chibon |
04eb13 |
username=repo.user.user if repo.is_fork else None,
|
|
Pierre-Yves Chibon |
ff8880 |
namespace=repo.namespace,
|
|
Ryan Lerch |
2aa95c |
commitid=commit.oid.hex) %}
|
|
Ryan Lerch |
2aa95c |
{% set tree_link = url_for(
|
|
Pierre-Yves Chibon |
04eb13 |
'ui_ns.view_tree',
|
|
Pierre-Yves Chibon |
04eb13 |
username=repo.user.user if repo.is_fork else None,
|
|
Pierre-Yves Chibon |
04eb13 |
namespace=repo.namespace,
|
|
Ryan Lerch |
2aa95c |
repo=repo.name, identifier=commit.hex) %}
|
|
Pierre-Yves Chibon |
fac185 |
{% endif %}
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
{% if commit_link %}
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
{% endif %}
|
|
Ryan Lerch |
2aa95c |
{{ commit.message.strip().split('\n')[0] }}
|
|
Ryan Lerch |
2aa95c |
{% if commit_link %}
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
{% endif %}
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
{{commit.author|author2user_commits(
|
|
Ryan Lerch |
2aa95c |
link=url_for('ui_ns.view_commits',
|
|
Ryan Lerch |
2aa95c |
repo=repo.name,
|
|
Ryan Lerch |
2aa95c |
branchname=branchname,
|
|
Pierre-Yves Chibon |
04eb13 |
username=repo.user.user if repo.is_fork else None,
|
|
Ryan Lerch |
2aa95c |
namespace=repo.namespace,
|
|
Ryan Lerch |
2aa95c |
author=commit.author.email),
|
|
Ryan Lerch |
2aa95c |
cssclass="notblue")|safe}}
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
title="{{ commit.commit_time|format_ts }}"> •
|
|
Ryan Lerch |
2aa95c |
{{ commit.commit_time|humanize }}
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
bc6d33 |
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
class="btn btn-outline-primary font-weight-bold {{'disabled' if not commit_link}}">
|
|
Ryan Lerch |
2aa95c |
{{ commit.hex|short }}
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
|
|
Pierre-Yves Chibon |
fac185 |
{% else %}
|
|
Pierre-Yves Chibon |
fac185 |
No commits found
|
|
Pierre-Yves Chibon |
fac185 |
{% endfor %}
|
|
Ryan Lerch |
bc6d33 |
|
|
Ryan Lerch |
ed0299 |
|
|
Ryan Lerch |
ed0299 |
|
|
Ryan Lerch |
a623af |
|
|
Ryan Lerch |
a623af |
{% if g.authenticated %}
|
|
Pierre-Yves Chibon |
b130e5 |
|
|
Pierre-Yves Chibon |
08a80b |
repo=repo.name,
|
|
Pierre-Yves Chibon |
04eb13 |
username=repo.user.user if repo.is_fork else None,
|
|
Pierre-Yves Chibon |
08a80b |
namespace=repo.namespace,
|
|
Pierre-Yves Chibon |
08a80b |
requestid=requestid)
|
|
Julen Landa Alustiza |
2db43b |
}}" method="post" class="icon form_pr_drop_comment">
|
|
Ryan Lerch |
ed0299 |
{% endif %}
|
|
Ryan Lerch |
ed0299 |
|
|
Ryan Lerch |
a623af |
{{repo_renderdiff(diff=diff,
|
|
Ryan Lerch |
a623af |
diff_commits=diff_commits,
|
|
Ryan Lerch |
a623af |
pull_request=pull_request,
|
|
Ryan Lerch |
a623af |
repo=repo,
|
|
Ryan Lerch |
a623af |
username=username,
|
|
Ryan Lerch |
a623af |
namespace=namespace)}}
|
|
Ryan Lerch |
ed0299 |
|
|
Ryan Lerch |
a623af |
{% if g.authenticated %}
|
|
Ryan Lerch |
ed0299 |
{{ mergeform.csrf_token }}
|
|
Ryan Lerch |
ed0299 |
|
|
Ryan Lerch |
ed0299 |
{% endif %}
|
|
Ryan Lerch |
ed0299 |
|
|
Ryan Lerch |
ed0299 |
|
|
Ryan Lerch |
6d2e06 |
|
|
Ryan Lerch |
bbf2cb |
|
|
Ryan Lerch |
2aa95c |
{{ show_pr_initial_comment(pull_request, repo, form, username) }}
|
|
Pierre-Yves Chibon |
a16bed |
<section class="request_comment"></section>
|
|
Pierre-Yves Chibon |
b130e5 |
|
|
Pierre-Yves Chibon |
08a80b |
repo=repo.name,
|
|
Pierre-Yves Chibon |
04eb13 |
username=repo.user.user if repo.is_fork else None,
|
|
Pierre-Yves Chibon |
08a80b |
namespace=repo.namespace,
|
|
Pierre-Yves Chibon |
08a80b |
requestid=requestid)
|
|
Julen Landa Alustiza |
2db43b |
}}" method="post" id="request_comment" class="form_pr_drop_comment">
|
|
Ryan Lerch |
ed0299 |
|
|
Pierre-Yves Chibon |
40a892 |
{% if pull_request.comments %}
|
|
Ryan Lerch |
46087c |
{% for comment in pull_request.comments %}
|
|
Pierre-Yves Chibon |
c6e91b |
{% if comment.commit_id %}
|
|
Ryan Lerch |
1fa495 |
{{ show_comment(comment, comment.id, repo, username,
|
|
Ryan Lerch |
1fa495 |
requestid, form, PRinline=True) }}
|
|
Pierre-Yves Chibon |
c6e91b |
{% elif comment.notification %}
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
{{ comment.user.default_email | avatar(24) | safe }}
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
502898 |
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
{{
|
|
Ryan Lerch |
2aa95c |
comment.date_created | humanize }}
|
|
Pierre-Yves Chibon |
c6e91b |
|
|
Pierre-Yves Chibon |
c6e91b |
|
|
Pierre-Yves Chibon |
c6e91b |
{% else %}
|
|
Pierre-Yves Chibon |
c6e91b |
{{ show_comment(comment, comment.id, repo, username,
|
|
Pierre-Yves Chibon |
0be529 |
requestid, form) }}
|
|
Ryan Lerch |
ed0299 |
{% endif %}
|
|
Ryan Lerch |
ed0299 |
{% endfor %}
|
|
Ryan Lerch |
ed0299 |
{{ mergeform.csrf_token }}
|
|
Ryan Lerch |
ed0299 |
{% endif %}
|
|
Pierre-Yves Chibon |
40a892 |
|
|
Ryan Lerch |
ed0299 |
|
|
Pierre-Yves Chibon |
00b4f7 |
|
|
Ryan Lerch |
a623af |
{% if g.authenticated and mergeform %}
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
{% if g.authenticated %}
|
|
Ryan Lerch |
ed0299 |
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
Add new comment
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
|
|
Pierre-Yves Chibon |
3ff704 |
Preview
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
|
|
Pierre-Yves Chibon |
3ff704 |
Edit
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
|
|
Lubomír Sedlář |
011b1b |
{% if repo.quick_replies %}
|
|
Lubomír Sedlář |
011b1b |
{% include "quick_reply.html" %}
|
|
Lubomír Sedlář |
011b1b |
{% endif %}
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
'ui_ns.pull_request_add_comment',
|
|
Ryan Lerch |
2aa95c |
repo=repo.name,
|
|
Pierre-Yves Chibon |
04eb13 |
username=repo.user.user if repo.is_fork else None,
|
|
Ryan Lerch |
2aa95c |
namespace=repo.namespace,
|
|
Ryan Lerch |
2aa95c |
requestid=requestid) }}"
|
|
Julen Landa Alustiza |
2db43b |
method="post" class="form_pr_add_comment">
|
|
Ryan Lerch |
2aa95c |
{{ mergeform.csrf_token }}
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
ed0299 |
|
|
Pierre-Yves Chibon |
a02e40 |
placeholder="Enter your comment here" tabindex=1>
|
|
Ryan Lerch |
4e67a9 |
|
|
Ryan Lerch |
ed0299 |
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
<small>Comments use </small>
|
|
Ryan Lerch |
2aa95c |
target="_blank" rel="noopener noreferrer" class="notblue">Markdown Syntax
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
value="Submit Comment" tabindex=2 />
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
ed0299 |
|
|
Ryan Lerch |
ed0299 |
{% endif %}
|
|
Ryan Lerch |
2aa95c |
|
|
Pierre-Yves Chibon |
0c1787 |
|
|
Pierre-Yves Chibon |
300897 |
|
|
Pierre-Yves Chibon |
300897 |
Pull this pull-request locally
|
|
Pierre-Yves Chibon |
300897 |
|
|
Pierre-Yves Chibon |
300897 |
|
|
Pierre-Yves Chibon |
300897 |
|
|
Pierre-Yves Chibon |
300897 |
|
|
Pierre-Yves Chibon |
300897 |
|
|
Pierre-Yves Chibon |
3ff704 |
git fetch {{ config.get('GIT_URL_GIT') }}{{ repo.fullname }}.git refs/pull/{{ pull_request.id }}/head:pr{{ pull_request.id }}
|
|
Pierre-Yves Chibon |
0c1787 |
|
|
Ryan Lerch |
ed0299 |
{% endif %}
|
|
Ryan Lerch |
ed0299 |
|
|
Ryan Lerch |
ed0299 |
|
|
Ryan Lerch |
bbf2cb |
|
|
Ryan Lerch |
ed0299 |
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2c259b |
|
|
Ryan Lerch |
502898 |
Metadata
|
|
Pierre-Yves Chibon |
b828fd |
{% if g.authenticated and mergeform
|
|
Pierre-Yves Chibon |
a7717f |
and (g.repo_user
|
|
Ryan Lerch |
2aa95c |
or g.fas_user.username == pull_request.user.user) %}
|
|
Ryan Lerch |
2aa95c |
|
|
Pierre-Yves Chibon |
3ff704 |
|
|
Pierre-Yves Chibon |
3ff704 |
|
|
Lubomír Sedlář |
0c35e3 |
|
|
Karsten Hopp |
130d0e |
{% endif %}
|
|
Ryan Lerch |
2aa95c |
|
|
Pierre-Yves Chibon |
a7717f |
{% if g.authenticated and mergeform and g.repo_user %}
|
|
Pierre-Yves Chibon |
b130e5 |
|
|
Pierre-Yves Chibon |
08a80b |
repo=repo.name,
|
|
Pierre-Yves Chibon |
04eb13 |
username=repo.user.user if repo.is_fork else None,
|
|
Pierre-Yves Chibon |
08a80b |
namespace=repo.namespace,
|
|
Pierre-Yves Chibon |
aaab36 |
requestid=requestid) }}">
|
|
Ryan Lerch |
f8997a |
<fieldset class="form-group issue-metadata-form hidden"></fieldset>
|
|
Ryan Lerch |
502898 |
<label>Assignee</label>
|
|
Ryan Lerch |
e68db5 |
|
|
Pierre-Yves Chibon |
bc4f2b |
|
|
Ryan Lerch |
e68db5 |
name="user" id="assignee" placeholder="username" >
|
|
Pierre-Yves Chibon |
bc4f2b |
{{ mergeform.csrf_token }}
|
|
Ryan Lerch |
e68db5 |
|
|
Ryan Lerch |
e68db5 |
|
|
Ryan Lerch |
e68db5 |
{% endif %}
|
|
Ryan Lerch |
2aa95c |
<fieldset class="form-group issue-metadata-display ml-1"></fieldset>
|
|
Pierre-Yves Chibon |
627fb1 |
<label class="mb-1 pl-1"> Assignee</label>
|
|
Pierre-Yves Chibon |
627fb1 |
|
|
Pierre-Yves Chibon |
627fb1 |
|
|
Ryan Lerch |
2aa95c |
{% if pull_request.assignee.username %}
|
|
Pierre-Yves Chibon |
627fb1 |
{{pull_request.assignee.username| avatar(size=24) | safe}}
|
|
Pierre-Yves Chibon |
627fb1 |
|
|
Pierre-Yves Chibon |
627fb1 |
'ui_ns.request_pulls',
|
|
Pierre-Yves Chibon |
627fb1 |
repo=repo.name,
|
|
Pierre-Yves Chibon |
627fb1 |
username=username,
|
|
Pierre-Yves Chibon |
627fb1 |
namespace=repo.namespace,
|
|
Pierre-Yves Chibon |
627fb1 |
assignee=pull_request.assignee.username)
|
|
Pierre-Yves Chibon |
627fb1 |
}}" title="{{ pull_request.assignee.html_title }}">
|
|
Pierre-Yves Chibon |
627fb1 |
{{ pull_request.assignee.username }}
|
|
Pierre-Yves Chibon |
627fb1 |
|
|
Pierre-Yves Chibon |
627fb1 |
{% if g.authenticated and (pull_request.assignee.username == g.fas_user.username) %}
|
|
Pierre-Yves Chibon |
3ff704 |
—
|
|
Pierre-Yves Chibon |
627fb1 |
title="drop the assignment of this pull-request">
|
|
Pierre-Yves Chibon |
627fb1 |
Drop
|
|
Pierre-Yves Chibon |
627fb1 |
|
|
Pierre-Yves Chibon |
627fb1 |
{% endif %}
|
|
Pierre-Yves Chibon |
627fb1 |
|
|
Ryan Lerch |
2aa95c |
{% else %}
|
|
Pierre-Yves Chibon |
627fb1 |
|
|
Pierre-Yves Chibon |
627fb1 |
None
|
|
Pierre-Yves Chibon |
627fb1 |
{% if g.authenticated and (g.repo_user or g.fas_user.username == pull_request.user.user) and pull_request.status|lower == 'open'
|
|
Pierre-Yves Chibon |
627fb1 |
and (not pull_request.assignee or pull_request.assignee.username != g.fas_user.username)
|
|
Pierre-Yves Chibon |
627fb1 |
and not repo.settings.get('pull_request_tracker_read_only', False) %}
|
|
Pierre-Yves Chibon |
3ff704 |
—
|
|
Pierre-Yves Chibon |
627fb1 |
title="assign this pull_request to you"> Take
|
|
Pierre-Yves Chibon |
627fb1 |
{% endif %}
|
|
Pierre-Yves Chibon |
627fb1 |
|
|
Ryan Lerch |
2aa95c |
{% endif %}
|
|
Pierre-Yves Chibon |
627fb1 |
|
|
Pierre-Yves Chibon |
c29244 |
|
|
Pierre-Yves Chibon |
c29244 |
|
|
Pierre-Yves Chibon |
c29244 |
|
|
Pierre-Yves Chibon |
b130e5 |
{% if g.authenticated and (
|
|
Pierre-Yves Chibon |
c29244 |
g.repo_user
|
|
Pierre-Yves Chibon |
c29244 |
or g.fas_user.username == pull_request.user.user) %}
|
|
Ryan Lerch |
f8997a |
<fieldset class="form-group issue-metadata-form hidden"></fieldset>
|
|
Pierre-Yves Chibon |
627fb1 |
<label class="mb-1"> Tags</label>
|
|
Pierre-Yves Chibon |
c29244 |
|
|
Pierre-Yves Chibon |
c29244 |
title="comma separated list of tags"
|
|
Pierre-Yves Chibon |
c29244 |
value="{{ pull_request.tags_text | join(',') }}" />
|
|
Pierre-Yves Chibon |
c29244 |
|
|
Pierre-Yves Chibon |
c29244 |
{% endif%}
|
|
Pierre-Yves Chibon |
c29244 |
|
|
Ryan Lerch |
2aa95c |
<fieldset class="form-group issue-metadata-display ml-1"></fieldset>
|
|
Ryan Lerch |
502898 |
<label class="mb-0">Tags</label>
|
|
Ryan Lerch |
2aa95c |
{% if pull_request.tags %}
|
|
Ryan Lerch |
2aa95c |
|
|
Pierre-Yves Chibon |
c29244 |
{% for tag in pull_request.tags %}
|
|
Pierre-Yves Chibon |
c29244 |
|
|
Pierre-Yves Chibon |
3ff704 |
data-bg-color="{{ tag.tag_color }}"
|
|
Pierre-Yves Chibon |
3ff704 |
class="badge badge-primary text-left my-1 p-2 badge-tag"
|
|
Pierre-Yves Chibon |
b130e5 |
href="{{ url_for('ui_ns.request_pulls',
|
|
Pierre-Yves Chibon |
c29244 |
repo=repo.name,
|
|
Pierre-Yves Chibon |
04eb13 |
username=repo.user.user if repo.is_fork else None,
|
|
Pierre-Yves Chibon |
c29244 |
namespace=repo.namespace,
|
|
Pierre-Yves Chibon |
c29244 |
tags=tag.tag) }}">
|
|
Pierre-Yves Chibon |
c29244 |
{{ tag.tag }}
|
|
Pierre-Yves Chibon |
c29244 |
|
|
Pierre-Yves Chibon |
c29244 |
{% endfor %}
|
|
Pierre-Yves Chibon |
c29244 |
|
|
Ryan Lerch |
2aa95c |
{% else %}
|
|
Ryan Lerch |
2aa95c |
No Tags
|
|
Ryan Lerch |
2aa95c |
{% endif %}
|
|
Pierre-Yves Chibon |
c29244 |
|
|
Pierre-Yves Chibon |
c29244 |
|
|
Pierre-Yves Chibon |
b828fd |
{% if g.authenticated and mergeform
|
|
Pierre-Yves Chibon |
a7717f |
and (g.repo_user
|
|
Pierre-Yves Chibon |
c29244 |
or g.fas_user.username == pull_request.user.user) %}
|
|
Ryan Lerch |
f8997a |
<input class="btn btn-primary issue-metadata-form hidden" type="submit" value="Update">
|
|
Ryan Lerch |
e68db5 |
|
|
Ryan Lerch |
e68db5 |
{% endif %}
|
|
Pierre-Yves Chibon |
bc4f2b |
|
|
Mark Reynolds |
62d9eb |
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
{% if pull_request.flags %}
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2c259b |
|
|
Ryan Lerch |
502898 |
Flags
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
{% for flag in pull_request.flags %}
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
502898 |
|
|
Ryan Lerch |
2aa95c |
{{ flag.username }}
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
{{ flag.status }}
|
|
Ryan Lerch |
2aa95c |
{%- if flag.percent %} ({{ flag.percent }}%) {%- endif %}
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
<small></small>
|
|
Ryan Lerch |
2aa95c |
{{ flag.comment }}
|
|
Pierre-Yves Chibon |
c01a85 |
|
|
Pierre-Yves Chibon |
c01a85 |
flag.date_created == flag.date_updated -%}
|
|
Pierre-Yves Chibon |
c01a85 |
Created at {% else -%} Updated at {% endif -%}
|
|
Pierre-Yves Chibon |
c01a85 |
{{ flag.date_updated }}" class="float-right">
|
|
Pierre-Yves Chibon |
c01a85 |
{{ flag.date_updated | humanize }}
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
{% endfor%}
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
{% endif %}
|
|
Ryan Lerch |
2aa95c |
|
|
Pierre-Yves Chibon |
b130e5 |
{% if g.authenticated %}
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2c259b |
|
|
Ryan Lerch |
502898 |
|
|
Ryan Lerch |
2aa95c |
Subscribers
|
|
Ryan Lerch |
5682fd |
{{subscribers|count}}
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
{% if g.fas_user.username in subscribers -%}
|
|
Ryan Lerch |
2aa95c |
title="Unsubscribe from this pull-request">Unsubscribe
|
|
Ryan Lerch |
2aa95c |
{%- else -%}
|
|
Ryan Lerch |
2aa95c |
title="Subscribe to this pull-request">Subscribe
|
|
Ryan Lerch |
2aa95c |
{%- endif -%}
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
{% if subscribers %}
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
|
|
Pierre-Yves Chibon |
fb92d8 |
{% for subscriber in subscribers %}
|
|
Pierre-Yves Chibon |
b130e5 |
|
|
Ryan Lerch |
5682fd |
}}" title="{{ subscriber }}" id="sub-avatar-{{subscriber}}">{{
|
|
Ryan Lerch |
2aa95c |
subscriber |avatar(size=30, css_class="pb-1") | safe
|
|
Pierre-Yves Chibon |
fb92d8 |
}}
|
|
Pierre-Yves Chibon |
fb92d8 |
{% endfor %}
|
|
Ryan Lerch |
2aa95c |
|
|
Mark Reynolds |
62d9eb |
|
|
Ryan Lerch |
2aa95c |
{% endif %}
|
|
Ryan Lerch |
2aa95c |
|
|
Pierre-Yves Chibon |
4f5301 |
|
|
Mark Reynolds |
62d9eb |
{% endif %}
|
|
Mark Reynolds |
62d9eb |
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
a623af |
{% if diff %}
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2c259b |
|
|
Ryan Lerch |
502898 |
|
|
Ryan Lerch |
2aa95c |
Changes Summary
|
|
Ryan Lerch |
2aa95c |
{{ diff|length if diff else 0}}
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
ac4e97 |
{% macro changeschangedfile(filepath, added, removed, diffanchor) -%}
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
+{{added}}
|
|
Ryan Lerch |
2aa95c |
-{{removed}}
|
|
Ryan Lerch |
be7be8 |
|
|
Ryan Lerch |
be7be8 |
|
|
Ryan Lerch |
be7be8 |
file changed
|
|
Ryan Lerch |
be7be8 |
|
|
Ryan Lerch |
9ca39b |
|
|
Ryan Lerch |
9ca39b |
|
|
Ryan Lerch |
2aa95c |
<small>{{filepath}}</small>
|
|
Ryan Lerch |
9ca39b |
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
9ca39b |
{%- endmacro %}
|
|
Ryan Lerch |
ac4e97 |
{% macro changesrenamedfile(oldfilepath, newfilepath, added, removed, diffanchor) -%}
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
+{{added}} -{{removed}}
|
|
Ryan Lerch |
9ca39b |
file renamed
|
|
Ryan Lerch |
9ca39b |
|
|
Ryan Lerch |
9ca39b |
|
|
Ryan Lerch |
ac4e97 |
<strike class="text-muted">{{oldfilepath}}</strike>
|
|
Ryan Lerch |
2aa95c |
<small>{{newfilepath}}</small>
|
|
Ryan Lerch |
9ca39b |
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
9ca39b |
{%- endmacro %}
|
|
Ryan Lerch |
ac4e97 |
{% macro changesdeletedfile(filepath, added, removed, diffanchor) -%}
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
-{{removed}}
|
|
Ryan Lerch |
ac4e97 |
file removed
|
|
Ryan Lerch |
9ca39b |
|
|
Ryan Lerch |
9ca39b |
|
|
Ryan Lerch |
2aa95c |
<small>{{filepath}}</small>
|
|
Ryan Lerch |
9ca39b |
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
9ca39b |
{%- endmacro %}
|
|
Ryan Lerch |
ac4e97 |
{% macro changesaddedfile(filepath, added, removed, diffanchor) -%}
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
+{{added}}
|
|
Ryan Lerch |
9ca39b |
file added
|
|
Ryan Lerch |
9ca39b |
|
|
Ryan Lerch |
9ca39b |
|
|
Pierre-Yves Chibon |
803170 |
<small>{{ filepath | unicode }}</small>
|
|
Ryan Lerch |
9ca39b |
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
9ca39b |
{%- endmacro %}
|
|
Ryan Lerch |
475779 |
|
|
Pierre-Yves Chibon |
ec362d |
{% for patch in diff %}
|
|
Pierre-Yves Chibon |
f6a6e0 |
{% set patchstats = (patch | patch_stats) %}
|
|
Pierre-Yves Chibon |
f6a6e0 |
{%- if patchstats["status"] == 'D' -%}
|
|
Pierre-Yves Chibon |
f6a6e0 |
{{ changesdeletedfile(patchstats["new_path"], patchstats["lines_added"], patchstats["lines_removed"], loop.index) }}
|
|
Pierre-Yves Chibon |
f6a6e0 |
{%-elif patchstats["status"] == 'A' -%}
|
|
Pierre-Yves Chibon |
f6a6e0 |
{{ changesaddedfile(patchstats["new_path"], patchstats["lines_added"], patchstats["lines_removed"], loop.index) }}
|
|
Pierre-Yves Chibon |
f6a6e0 |
{%-elif patchstats["status"] == 'M' -%}
|
|
Pierre-Yves Chibon |
f6a6e0 |
{{ changeschangedfile(patchstats["new_path"], patchstats["lines_added"], patchstats["lines_removed"], loop.index) }}
|
|
Pierre-Yves Chibon |
f6a6e0 |
{%- else -%}
|
|
Pierre-Yves Chibon |
f6a6e0 |
{{changesrenamedfile(patchstats["old_path"], patchstats["new_path"], patchstats["lines_added"], patchstats["lines_removed"], loop.index) }}
|
|
Pierre-Yves Chibon |
f6a6e0 |
{%-endif-%}
|
|
Pierre-Yves Chibon |
ec362d |
{% endfor %}
|
|
Ryan Lerch |
475779 |
|
|
Pierre-Yves Chibon |
ec362d |
|
|
Pierre-Yves Chibon |
ec362d |
{% endif %}
|
|
Pierre-Yves Chibon |
bc4f2b |
|
|
Ryan Lerch |
6d2e06 |
|
|
Ryan Lerch |
bbf2cb |
|
|
Ryan Lerch |
bbf2cb |
|
|
Ryan Lerch |
bbf2cb |
|
|
Ryan Lerch |
bbf2cb |
|
|
Ryan Lerch |
bbf2cb |
|
|
Pierre-Yves Chibon |
2abb86 |
|
|
Pierre-Yves Chibon |
267613 |
{% endblock %}
|
|
Pierre-Yves Chibon |
267613 |
|
|
Pierre-Yves Chibon |
267613 |
{% block jscripts %}
|
|
Pierre-Yves Chibon |
267613 |
{{ super() }}
|
|
Pierre-Yves Chibon |
3ff704 |
|
|
Pierre-Yves Chibon |
3ff704 |
url_for('static', filename='vendor/jquery.textcomplete/jquery.textcomplete.min.js') }}?version={{ g.version}}">
|
|
Pierre-Yves Chibon |
3ff704 |
|
|
Pierre-Yves Chibon |
3ff704 |
url_for('static', filename='vendor/emojione/emojione.min.js') }}?version={{ g.version}}">
|
|
Pierre-Yves Chibon |
3ff704 |
|
|
Pierre-Yves Chibon |
3ff704 |
url_for('static', filename='emoji/emojicomplete.js') }}?version={{ g.version}}">
|
|
Pierre-Yves Chibon |
3ff704 |
|
|
Pierre-Yves Chibon |
3ff704 |
url_for('static', filename='vendor/selectize/selectize.min.js') }}?version={{ g.version}}">
|
|
Pierre-Yves Chibon |
3ff704 |
|
|
Pierre-Yves Chibon |
3ff704 |
url_for('static', filename='vendor/jquery.caret/jquery.caret.min.js') }}?version={{ g.version}}">
|
|
Pierre-Yves Chibon |
3ff704 |
|
|
Pierre-Yves Chibon |
3ff704 |
url_for('static', filename='vendor/jquery.atwho/jquery.atwho.min.js') }}?version={{ g.version}}">
|
|
Pierre-Yves Chibon |
3ff704 |
|
|
Pierre-Yves Chibon |
3ff704 |
url_for('static', filename='request_ev.js') }}?version={{ g.version}}">
|
|
Pierre-Yves Chibon |
53cff7 |
|
|
Pierre-Yves Chibon |
7694ed |
<script nonce="{{ g.nonce }}" type="text/javascript"></script>
|
|
Pierre-Yves Chibon |
89db07 |
function cancel_edit_btn() {
|
|
Pierre-Yves Chibon |
89db07 |
$(".cancel").unbind();
|
|
rahul Bajaj |
e4bb28 |
$(".cancel").click(
|
|
Pierre-Yves Chibon |
89db07 |
function() {
|
|
rahul Bajaj |
e4bb28 |
var item = $(this).closest('section');
|
|
Pierre-Yves Chibon |
89db07 |
$(item.parent().find('.issue_comment')).show();
|
|
Pierre-Yves Chibon |
89db07 |
$(item.parent().find('.issue_actions')).show();
|
|
Pierre-Yves Chibon |
efa9c7 |
var form = item.find('.pr_comment_form');
|
|
Pierre-Yves Chibon |
efa9c7 |
{# regular comments have the .pr_comment_form within the closest section #}
|
|
Pierre-Yves Chibon |
efa9c7 |
if (form.length){
|
|
Pierre-Yves Chibon |
efa9c7 |
$(form).remove();
|
|
Pierre-Yves Chibon |
efa9c7 |
} else {
|
|
Pierre-Yves Chibon |
efa9c7 |
{# inline comments have the section within the .pr_comment_form #}
|
|
Pierre-Yves Chibon |
efa9c7 |
var form = $(this).closest('.pr_comment_form').parent();
|
|
Pierre-Yves Chibon |
efa9c7 |
$(form).remove();
|
|
Pierre-Yves Chibon |
efa9c7 |
}
|
|
Pierre-Yves Chibon |
89db07 |
return false;
|
|
Pierre-Yves Chibon |
89db07 |
}
|
|
Pierre-Yves Chibon |
89db07 |
);
|
|
Pierre-Yves Chibon |
89db07 |
};
|
|
Pierre-Yves Chibon |
89db07 |
|
|
Pierre-Yves Chibon |
89db07 |
function setup_edit_btns() {
|
|
Pierre-Yves Chibon |
89db07 |
$(".edit_btn").unbind();
|
|
Pierre-Yves Chibon |
89db07 |
$(".edit_btn").click(function() {
|
|
Pierre-Yves Chibon |
89db07 |
var commentid = $( this ).attr('data-comment');
|
|
Pierre-Yves Chibon |
89db07 |
var _url = '{{ request.base_url }}' + '/comment/' + commentid + '/edit';
|
|
Pierre-Yves Chibon |
89db07 |
$.ajax({
|
|
Pierre-Yves Chibon |
89db07 |
url: _url + '?js=1',
|
|
Pierre-Yves Chibon |
89db07 |
type: 'GET',
|
|
Pierre-Yves Chibon |
89db07 |
dataType: 'html',
|
|
Pierre-Yves Chibon |
89db07 |
success: function(res) {
|
|
Pierre-Yves Chibon |
89db07 |
var el = $('#comment-' + commentid);
|
|
Pierre-Yves Chibon |
89db07 |
var sec = el.parent().find('.issue_comment');
|
|
Pierre-Yves Chibon |
89db07 |
$(sec).hide();
|
|
Pierre-Yves Chibon |
89db07 |
el.parent().find('.issue_actions').hide();
|
|
Pierre-Yves Chibon |
89db07 |
$(sec).after(res);
|
|
Pierre-Yves Chibon |
89db07 |
cancel_edit_btn();
|
|
Pierre-Yves Chibon |
89db07 |
},
|
|
Pierre-Yves Chibon |
89db07 |
error: function() {
|
|
Pierre-Yves Chibon |
89db07 |
alert('Could not make edit work');
|
|
Pierre-Yves Chibon |
89db07 |
}
|
|
Pierre-Yves Chibon |
89db07 |
});
|
|
Pierre-Yves Chibon |
89db07 |
return false;
|
|
Pierre-Yves Chibon |
89db07 |
});
|
|
Pierre-Yves Chibon |
89db07 |
};
|
|
Pierre-Yves Chibon |
53cff7 |
|
|
Pierre-Yves Chibon |
4350fb |
function setup_reply_btns() {
|
|
Pierre-Yves Chibon |
4350fb |
$(".reply").unbind();
|
|
Pierre-Yves Chibon |
4350fb |
$( ".reply" ).click(
|
|
Pierre-Yves Chibon |
4350fb |
function() {
|
|
Ryan Lerch |
2aa95c |
var _section = $(this).closest('.card');
|
|
Pierre-Yves Chibon |
4350fb |
var _comment = _section.find('.comment_body');
|
|
Pierre-Yves Chibon |
4350fb |
var _text = _comment.text().split("\n");
|
|
Pierre-Yves Chibon |
4350fb |
var _output = new Array();
|
|
Pierre-Yves Chibon |
4350fb |
for (var cnt=0; cnt < _text.length; cnt++) {
|
|
Pierre-Yves Chibon |
4350fb |
_output[cnt] = '> ' + _text[cnt];
|
|
Pierre-Yves Chibon |
4350fb |
}
|
|
Pierre-Yves Chibon |
7a139b |
var _prev = $.trim($( "#comment" ).val());
|
|
Pierre-Yves Chibon |
7a139b |
if (_prev.length > 0){
|
|
Pierre-Yves Chibon |
7a139b |
_prev += "\n\n";
|
|
Pierre-Yves Chibon |
7a139b |
}
|
|
Julen Landa Alustiza |
5daf24 |
$( "#comment" ).val(_prev + _output.join("\n") + "\n\n");
|
|
Julen Landa Alustiza |
06d7e0 |
$( "#comment" ).focus();
|
|
Pierre-Yves Chibon |
4350fb |
}
|
|
Pierre-Yves Chibon |
4350fb |
);
|
|
Pierre-Yves Chibon |
4350fb |
};
|
|
Pierre-Yves Chibon |
4350fb |
|
|
Ryan Lerch |
46087c |
|
|
Pierre-Yves Chibon |
d5c458 |
function showTab(){
|
|
Pierre-Yves Chibon |
d5c458 |
$('#pr-tabs a[href="#request_diff"]').tab('show')
|
|
Pierre-Yves Chibon |
d5c458 |
}
|
|
Ryan Lerch |
46087c |
|
|
Pierre-Yves Chibon |
a7063a |
{% if pull_request %}
|
|
Pierre-Yves Chibon |
d5c458 |
function show_merge_status(){
|
|
Pierre-Yves Chibon |
d5c458 |
function process_response(res) {
|
|
Pierre-Yves Chibon |
d5c458 |
$('#spinner').hide();
|
|
Pierre-Yves Chibon |
2955bb |
$('#merge_dropdown_btn').removeClass("disabled");
|
|
Pierre-Yves Chibon |
2955bb |
$('#merge_dropdown_btn span.fa').removeClass("fa-spin");
|
|
Pierre-Yves Chibon |
d5c458 |
if (res.code == 'FFORWARD'){
|
|
Ryan Lerch |
2aa95c |
$('#merge_dropdown_btn').toggleClass("btn-outline-secondary btn-success");
|
|
Ryan Lerch |
2aa95c |
$('#merge_dropdown_btn span.fa').toggleClass("fa-circle-o-notch fa-check");
|
|
Pierre-Yves Chibon |
d5c458 |
$('#merge_btn').addClass("btn-success");
|
|
Ryan Lerch |
2aa95c |
$('#merge-alert .alert').addClass("alert-success");
|
|
Pierre-Yves Chibon |
2955bb |
$('#merge-alert-message').text(res.message);
|
|
Pierre-Yves Chibon |
2955bb |
$('#merge-alert #rebase_btn').hide();
|
|
Pierre-Yves Chibon |
2955bb |
$('#merge-alert div.small').show();
|
|
Pierre-Yves Chibon |
2955bb |
$('#merge_btn').show();
|
|
Pierre-Yves Chibon |
d5c458 |
}
|
|
Pierre-Yves Chibon |
d5c458 |
else if (res.code == 'MERGE') {
|
|
Ryan Lerch |
2aa95c |
$('#merge_dropdown_btn').toggleClass("btn-outline-secondary btn-warning");
|
|
Ryan Lerch |
2aa95c |
$('#merge_dropdown_btn span.fa').toggleClass("fa-circle-o-notch fa-check");
|
|
Pierre-Yves Chibon |
d5c458 |
$('#merge_btn').addClass("btn-warning");
|
|
Ryan Lerch |
2aa95c |
$('#merge-alert .alert').addClass("alert-warning");
|
|
Pierre-Yves Chibon |
2955bb |
$('#merge-alert-message').text(res.message);
|
|
Pierre-Yves Chibon |
2955bb |
$('#merge-alert div.small').show();
|
|
Pierre-Yves Chibon |
2955bb |
$('#merge_btn').show();
|
|
Pierre-Yves Chibon |
2955bb |
}
|
|
Pierre-Yves Chibon |
2955bb |
else if (res.code == 'NEEDSREBASE') {
|
|
Pierre-Yves Chibon |
2955bb |
$('#merge_dropdown_btn').toggleClass("btn-outline-secondary btn-warning");
|
|
Pierre-Yves Chibon |
2955bb |
$('#merge_dropdown_btn span.fa').toggleClass("fa-circle-o-notch fa-times");
|
|
Pierre-Yves Chibon |
2955bb |
$('#merge_btn').hide();
|
|
Pierre-Yves Chibon |
2955bb |
$('#merge-alert .alert').addClass("alert-warning");
|
|
Pierre-Yves Chibon |
2955bb |
$('#merge-alert-message').text(res.message);
|
|
Pierre-Yves Chibon |
2955bb |
$('#merge-alert div.small').hide();
|
|
Pierre-Yves Chibon |
d5c458 |
}
|
|
Pierre-Yves Chibon |
d5c458 |
else if (res.code == 'CONFLICTS') {
|
|
Ryan Lerch |
2aa95c |
$('#merge_dropdown_btn').toggleClass("btn-outline-secondary btn-danger");
|
|
Ryan Lerch |
2aa95c |
$('#merge_dropdown_btn span.fa').toggleClass("fa-circle-o-notch fa-times");
|
|
Pierre-Yves Chibon |
d5c458 |
$('#merge_btn').hide();
|
|
Ryan Lerch |
2aa95c |
$('#merge-alert .alert').addClass("alert-danger");
|
|
Pierre-Yves Chibon |
2955bb |
$('#merge-alert-message').text(res.message);
|
|
Lubomír Sedlář |
0c35e3 |
$('#merge-alert div.small').hide();
|
|
Pierre-Yves Chibon |
2955bb |
$('#merge-alert #rebase_btn').hide();
|
|
Pierre-Yves Chibon |
d5c458 |
}
|
|
Pierre-Yves Chibon |
d5c458 |
else if (res.code == 'NO_CHANGE') {
|
|
Pierre-Yves Chibon |
d5c458 |
$('#merge_btn').hide();
|
|
Ryan Lerch |
2aa95c |
$('#merge_dropdown_btn span.fa').toggleClass("fa-circle-o-notch fa-times");
|
|
Ryan Lerch |
2aa95c |
$('#merge-alert .alert').addClass("alert-secondary");
|
|
Pierre-Yves Chibon |
2955bb |
$('#merge-alert-message').text(res.message);
|
|
Lubomír Sedlář |
0c35e3 |
$('#merge-alert div.small').hide();
|
|
Pierre-Yves Chibon |
2955bb |
$('#merge-alert #rebase_btn').hide();
|
|
Pierre-Yves Chibon |
d5c458 |
}
|
|
Pierre-Yves Chibon |
d5c458 |
};
|
|
Pierre-Yves Chibon |
d5c458 |
$('#spinner').show();
|
|
Ryan Lerch |
2aa95c |
function sleep(ms) {
|
|
Ryan Lerch |
2aa95c |
return new Promise(resolve => setTimeout(resolve, ms));
|
|
Ryan Lerch |
2aa95c |
}
|
|
Ryan Lerch |
2aa95c |
|
|
Pierre-Yves Chibon |
d5c458 |
$.ajax({
|
|
Pierre-Yves Chibon |
d5c458 |
url: '{{ url_for("internal_ns.mergeable_request_pull") }}' ,
|
|
Ryan Lerch |
2aa95c |
beforeSend: function(){sleep(8000); return true;},
|
|
Pierre-Yves Chibon |
d5c458 |
type: 'POST',
|
|
Pierre-Yves Chibon |
d5c458 |
data: {
|
|
Pierre-Yves Chibon |
d5c458 |
requestid: "{{ pull_request.uid }}",
|
|
Pierre-Yves Chibon |
d5c458 |
csrf_token: "{{ mergeform.csrf_token.current_token }}",
|
|
Pierre-Yves Chibon |
d5c458 |
},
|
|
Pierre-Yves Chibon |
d5c458 |
dataType: 'json',
|
|
Pierre-Yves Chibon |
d5c458 |
success: function(res) {
|
|
Pierre-Yves Chibon |
d5c458 |
process_response(res)
|
|
Pierre-Yves Chibon |
d5c458 |
},
|
|
Pierre-Yves Chibon |
d5c458 |
error: function(res) {
|
|
Pierre-Yves Chibon |
d5c458 |
process_response(res.responseJSON);
|
|
Pierre-Yves Chibon |
d5c458 |
$('#merge_btn').attr("disabled", "disabled");
|
|
Pierre-Yves Chibon |
d5c458 |
}
|
|
Pierre-Yves Chibon |
d5c458 |
});
|
|
Pierre-Yves Chibon |
d5c458 |
return false;
|
|
Pierre-Yves Chibon |
d5c458 |
}
|
|
Pierre-Yves Chibon |
a7063a |
{% endif %}
|
|
Ryan Lerch |
46087c |
|
|
Pierre-Yves Chibon |
d5c458 |
$(document).ready(function() {
|
|
Pierre-Yves Chibon |
36de81 |
$('#merge_btn').click(function() {
|
|
Pierre-Yves Chibon |
36de81 |
return confirm('Confirm merging this pull-request');
|
|
Pierre-Yves Chibon |
36de81 |
});
|
|
Pierre-Yves Chibon |
36de81 |
$('.trigger-ci-btn').click(function() {
|
|
Pierre-Yves Chibon |
36de81 |
$('#ci_pr_comment').val($(this).attr("data-comment"));
|
|
Pierre-Yves Chibon |
36de81 |
$('#ci_pr_trigger_form').submit();
|
|
Pierre-Yves Chibon |
36de81 |
});
|
|
Pierre-Yves Chibon |
36de81 |
$('.inline_comment_link_btn').click(function() { showTab() });
|
|
Pierre-Yves Chibon |
36de81 |
$('.delete_comment_btn').click(function() {
|
|
Pierre-Yves Chibon |
36de81 |
return confirm('Do you really want to remove this comment?');
|
|
Pierre-Yves Chibon |
36de81 |
});
|
|
Pierre-Yves Chibon |
53cff7 |
|
|
Pierre-Yves Chibon |
2955bb |
$('#rebase_btn').click(function(){
|
|
Pierre-Yves Chibon |
43fae3 |
var _conf = confirm('Confirm rebasing this pull-request');
|
|
Pierre-Yves Chibon |
43fae3 |
if (_conf === false){
|
|
Pierre-Yves Chibon |
43fae3 |
return false;
|
|
Pierre-Yves Chibon |
43fae3 |
}
|
|
Pierre-Yves Chibon |
2955bb |
$('#merge_dropdown_btn span.fa').removeClass(
|
|
Pierre-Yves Chibon |
2955bb |
"fa-circle-o-notch fa-times fa-check").addClass(
|
|
Pierre-Yves Chibon |
2955bb |
"fa-circle-o-notch fa-fw");
|
|
Pierre-Yves Chibon |
2955bb |
$('#merge_btn').removeClass("btn-success btn-warning btn-danger");
|
|
Pierre-Yves Chibon |
2955bb |
$('#merge-alert .alert').removeClass("alert-success alert-warning alert-danger");
|
|
Pierre-Yves Chibon |
2955bb |
$('#merge_dropdown_btn').addClass("disabled");
|
|
Pierre-Yves Chibon |
2955bb |
$('#merge_dropdown_btn').removeClass(
|
|
Pierre-Yves Chibon |
2955bb |
"btn-outline-secondary btn-danger btn-warning btn-success").addClass(
|
|
Pierre-Yves Chibon |
2955bb |
"btn btn-outline-secondary btn-sm disabled dropdown-toggle");
|
|
Pierre-Yves Chibon |
2955bb |
$('#merge_dropdown_btn span.fa').addClass("fa-spin");
|
|
Pierre-Yves Chibon |
2955bb |
$.ajax({
|
|
Pierre-Yves Chibon |
2955bb |
url: '{{ url_for('api_ns.api_pull_request_rebase',
|
|
Pierre-Yves Chibon |
2955bb |
repo=repo.name,
|
|
Pierre-Yves Chibon |
2955bb |
username=username,
|
|
Pierre-Yves Chibon |
2955bb |
namespace=repo.namespace,
|
|
Pierre-Yves Chibon |
2955bb |
requestid=requestid)
|
|
Pierre-Yves Chibon |
2955bb |
}}' ,
|
|
Pierre-Yves Chibon |
2955bb |
type: 'POST',
|
|
Pierre-Yves Chibon |
2955bb |
data: {
|
|
Pierre-Yves Chibon |
2955bb |
csrf_token: "{{ mergeform.csrf_token.current_token }}",
|
|
Pierre-Yves Chibon |
2955bb |
},
|
|
Pierre-Yves Chibon |
2955bb |
dataType: 'json',
|
|
Pierre-Yves Chibon |
2955bb |
success: function(res) {
|
|
Pierre-Yves Chibon |
2955bb |
show_merge_status()
|
|
Pierre-Yves Chibon |
2955bb |
},
|
|
Pierre-Yves Chibon |
2955bb |
error: function(res) {
|
|
Pierre-Yves Chibon |
2955bb |
$('#merge_dropdown_btn').removeClass("disabled");
|
|
Pierre-Yves Chibon |
2955bb |
$('#merge_dropdown_btn span.fa').removeClass("fa-spin");
|
|
Pierre-Yves Chibon |
2955bb |
$('#merge_dropdown_btn').toggleClass("btn-outline-secondary btn-danger");
|
|
Pierre-Yves Chibon |
2955bb |
$('#merge_dropdown_btn span.fa').toggleClass("fa-circle-o-notch fa-times");
|
|
Pierre-Yves Chibon |
2955bb |
$('#merge_btn').hide();
|
|
Pierre-Yves Chibon |
2955bb |
$('#merge-alert #rebase_btn').hide();
|
|
Pierre-Yves Chibon |
2955bb |
$('#merge-alert .alert').addClass("alert-danger");
|
|
Pierre-Yves Chibon |
2955bb |
$('#merge-alert-message').text('Failed to rebase this PR');
|
|
Pierre-Yves Chibon |
2955bb |
$('#merge-alert div.small').hide();
|
|
Pierre-Yves Chibon |
2955bb |
}
|
|
Pierre-Yves Chibon |
2955bb |
});
|
|
Pierre-Yves Chibon |
2955bb |
});
|
|
Pierre-Yves Chibon |
2955bb |
|
|
Pierre-Yves Chibon |
f8bd9f |
$( ".commit_msg_txt" ).hide();
|
|
Pierre-Yves Chibon |
f8bd9f |
$( ".commit_msg_btn" ).click(function() {
|
|
Pierre-Yves Chibon |
f8bd9f |
var msgid = $( this ).attr('data-id');
|
|
Pierre-Yves Chibon |
f8bd9f |
$( '#commit_msg_' + msgid).toggle();
|
|
Pierre-Yves Chibon |
f8bd9f |
});
|
|
Pierre-Yves Chibon |
f8bd9f |
|
|
Neha Kandpal |
68fd3d |
var folder = '{{url_for("static", filename="emoji/png/") }}?version={{ g.version}}';
|
|
Neha Kandpal |
68fd3d |
var json_url = '{{ url_for("static", filename="vendor/emojione/emoji_strategy.json") }}?version={{ g.version}}';
|
|
Pierre-Yves Chibon |
53cff7 |
|
|
Ryan Lerch |
261ed4 |
var branchselect = $('#branch_select').selectize({
|
|
Pierre-Yves Chibon |
b22f85 |
create: false,
|
|
Pierre-Yves Chibon |
b22f85 |
sortField: 'text',
|
|
Pierre-Yves Chibon |
b22f85 |
allowEmptyOption: false,
|
|
Pierre-Yves Chibon |
b22f85 |
onChange: function(value) {
|
|
Pierre-Yves Chibon |
b22f85 |
if (value != ""){
|
|
Ryan Lerch |
261ed4 |
var sel = $('#branch_select');
|
|
Pierre-Yves Chibon |
04eb13 |
var final_url = "{{ url_for('ui_ns.new_request_pull',
|
|
Pierre-Yves Chibon |
04eb13 |
username=repo.user.user if repo.is_fork else None,
|
|
Pierre-Yves Chibon |
ff8880 |
namespace=repo.namespace, repo=repo.name,
|
|
Pierre-Yves Chibon |
d39de9 |
branch_from=branch_from, branch_to='--', project_to=project_to) }}";
|
|
Ryan Lerch |
261ed4 |
final_url = final_url.replace('--', sel.val());
|
|
Ryan Lerch |
261ed4 |
window.location.href = final_url;
|
|
Pierre-Yves Chibon |
b22f85 |
}
|
|
Pierre-Yves Chibon |
071f09 |
}
|
|
Ryan Lerch |
261ed4 |
});
|
|
Ryan Lerch |
261ed4 |
|
|
Pierre-Yves Chibon |
bd4cd5 |
var branchselect = $('#branch_from_select').selectize({
|
|
Pierre-Yves Chibon |
bd4cd5 |
create: false,
|
|
Pierre-Yves Chibon |
bd4cd5 |
sortField: 'text',
|
|
Pierre-Yves Chibon |
bd4cd5 |
allowEmptyOption: false,
|
|
Pierre-Yves Chibon |
bd4cd5 |
onChange: function(value) {
|
|
Pierre-Yves Chibon |
bd4cd5 |
if (value != ""){
|
|
Pierre-Yves Chibon |
bd4cd5 |
var sel = $('#branch_from_select');
|
|
Pierre-Yves Chibon |
04eb13 |
var final_url = "{{ url_for('ui_ns.new_request_pull',
|
|
Pierre-Yves Chibon |
04eb13 |
username=repo.user.user if repo.is_fork else None,
|
|
Pierre-Yves Chibon |
bd4cd5 |
namespace=repo.namespace, repo=repo.name,
|
|
Pierre-Yves Chibon |
d39de9 |
branch_from='--', branch_to=branch_to, project_to=project_to) }}";
|
|
Pierre-Yves Chibon |
bd4cd5 |
final_url = final_url.replace('--', sel.val());
|
|
Pierre-Yves Chibon |
bd4cd5 |
console.log(final_url);
|
|
Pierre-Yves Chibon |
bd4cd5 |
//return false;
|
|
Pierre-Yves Chibon |
bd4cd5 |
window.location.href = final_url;
|
|
Pierre-Yves Chibon |
bd4cd5 |
}
|
|
Pierre-Yves Chibon |
bd4cd5 |
}
|
|
Pierre-Yves Chibon |
bd4cd5 |
});
|
|
Pierre-Yves Chibon |
bd4cd5 |
|
|
Julen Landa Alustiza |
2db43b |
$('.form_pr_drop_comment').submit(function() {
|
|
Julen Landa Alustiza |
98018d |
return try_async_comment($(this), null);
|
|
Julen Landa Alustiza |
2db43b |
});
|
|
Julen Landa Alustiza |
2db43b |
|
|
Julen Landa Alustiza |
2db43b |
$('.form_pr_add_comment').submit(function() {
|
|
Julen Landa Alustiza |
98018d |
return try_async_comment($(this), false);
|
|
Julen Landa Alustiza |
2db43b |
})
|
|
Julen Landa Alustiza |
2db43b |
|
|
Julen Landa Alustiza |
f90c1c |
function submitFormOnCtrlKey(event) {
|
|
Julen Landa Alustiza |
f90c1c |
if (event.ctrlKey && event.keyCode == 13) {
|
|
Julen Landa Alustiza |
f90c1c |
var form = event.target.form;
|
|
Julen Landa Alustiza |
f90c1c |
form.submit();
|
|
Julen Landa Alustiza |
f90c1c |
event.preventDefault();
|
|
Julen Landa Alustiza |
f90c1c |
}
|
|
Julen Landa Alustiza |
f90c1c |
}
|
|
Julen Landa Alustiza |
f90c1c |
|
|
Julen Landa Alustiza |
f90c1c |
$('#comment').keydown(function(e) {
|
|
Julen Landa Alustiza |
f90c1c |
submitFormOnCtrlKey(e);
|
|
Julen Landa Alustiza |
f90c1c |
});
|
|
Julen Landa Alustiza |
f90c1c |
$('#inline-comment').keydown(function(e) {
|
|
Julen Landa Alustiza |
f90c1c |
submitFormOnCtrlKey(e);
|
|
Julen Landa Alustiza |
f90c1c |
});
|
|
Julen Landa Alustiza |
f90c1c |
|
|
Pierre-Yves Chibon |
07f5d3 |
{% if pull_request %}
|
|
Pierre-Yves Chibon |
07f5d3 |
{# These lines are only for existing pull-requests, not new ones #}
|
|
Pierre-Yves Chibon |
53cff7 |
|
|
Pierre-Yves Chibon |
53cff7 |
emoji_complete(json_url, folder);
|
|
Pierre-Yves Chibon |
53cff7 |
|
|
Pierre-Yves Chibon |
0c1787 |
$('#local_pull_info_btn').click(function(){
|
|
Pierre-Yves Chibon |
0c1787 |
var _el = $('#local_pull_info');
|
|
Pierre-Yves Chibon |
0c1787 |
if (! _el.is(':visible')){
|
|
Pierre-Yves Chibon |
0c1787 |
_el.show();
|
|
Pierre-Yves Chibon |
300897 |
$('#local_pull_info_btn').html('');
|
|
Pierre-Yves Chibon |
0c1787 |
} else {
|
|
Pierre-Yves Chibon |
0c1787 |
_el.hide();
|
|
Pierre-Yves Chibon |
300897 |
$('#local_pull_info_btn').html('');
|
|
Pierre-Yves Chibon |
0c1787 |
}
|
|
Pierre-Yves Chibon |
0c1787 |
return false;
|
|
Pierre-Yves Chibon |
0c1787 |
});
|
|
Pierre-Yves Chibon |
0c1787 |
|
|
Pierre-Yves Chibon |
a35061 |
$('#close_pr').click(function(){
|
|
Pierre-Yves Chibon |
8ca3eb |
return window.confirm("Are you sure you want to close this requested pull?");
|
|
Johan Cwiklinski |
86d9c4 |
});
|
|
Pierre-Yves Chibon |
071f09 |
|
|
Karsten Hopp |
130d0e |
$('#reopen_pr').click(function(){
|
|
Karsten Hopp |
130d0e |
return window.confirm("Are you sure you want to reopen this requested pull?");
|
|
Karsten Hopp |
130d0e |
});
|
|
Karsten Hopp |
130d0e |
|
|
Julen Landa Alustiza |
059616 |
$(".comment_body").each(function(ind, obj) {
|
|
Julen Landa Alustiza |
059616 |
var source = $(obj).html();
|
|
Julen Landa Alustiza |
059616 |
var preview = emojione.toImage(source);
|
|
Julen Landa Alustiza |
059616 |
$(obj).html(preview);
|
|
Julen Landa Alustiza |
059616 |
});
|
|
Julen Landa Alustiza |
059616 |
$(".pr_comment").each(function(ind, obj) {
|
|
Julen Landa Alustiza |
059616 |
var source = $(obj).html();
|
|
Julen Landa Alustiza |
059616 |
var preview = emojione.toImage(source);
|
|
Julen Landa Alustiza |
059616 |
$(obj).html(preview);
|
|
Julen Landa Alustiza |
059616 |
});
|
|
Julen Landa Alustiza |
059616 |
|
|
Farhaan Bukhsh |
725217 |
{% if g.authenticated %}
|
|
Farhaan Bukhsh |
725217 |
|
|
Pierre-Yves Chibon |
52e88f |
$( ".code_table tr" ).hover(
|
|
Pierre-Yves Chibon |
267613 |
function() {
|
|
Pierre-Yves Chibon |
bc4f2b |
$( this ).find( ".prc_img" ).show().width(13);
|
|
Pierre-Yves Chibon |
267613 |
}, function() {
|
|
Pierre-Yves Chibon |
bc4f2b |
$( this ).find( ".prc_img" ).hide();
|
|
Pierre-Yves Chibon |
267613 |
}
|
|
Pierre-Yves Chibon |
267613 |
);
|
|
Pierre-Yves Chibon |
267613 |
|
|
Pierre-Yves Chibon |
267613 |
$( ".prc" ).click(
|
|
Pierre-Yves Chibon |
267613 |
function() {
|
|
Pierre-Yves Chibon |
1a1f78 |
var disabled = $('.prc').attr('disabled');
|
|
Pierre-Yves Chibon |
1a1f78 |
if (disabled === true || disabled == "disabled") {
|
|
Pierre-Yves Chibon |
1a1f78 |
return false;
|
|
Pierre-Yves Chibon |
1a1f78 |
}
|
|
Pierre-Yves Chibon |
1a1f78 |
$(".prc").attr("disabled","disabled");
|
|
Pierre-Yves Chibon |
267613 |
var row = $( this ).attr('data-row');
|
|
Pierre-Yves Chibon |
267613 |
var commit = $( this ).attr('data-commit');
|
|
Pierre-Yves Chibon |
9718ee |
var filename = $( this ).attr('data-filename');
|
|
Pierre-Yves Chibon |
444b61 |
var tree_id = $( this ).attr('data-tree');
|
|
Pierre-Yves Chibon |
267613 |
var url = "{{ url_for(
|
|
Pierre-Yves Chibon |
b130e5 |
'ui_ns.pull_request_add_comment',
|
|
Pierre-Yves Chibon |
08a80b |
repo=repo.name,
|
|
Pierre-Yves Chibon |
04eb13 |
username=repo.user.user if repo.is_fork else None,
|
|
Pierre-Yves Chibon |
ff8880 |
namespace=repo.namespace,
|
|
Pierre-Yves Chibon |
9718ee |
requestid=requestid, commit='', filename='', row='') }}".slice(0, -2);
|
|
Pierre-Yves Chibon |
444b61 |
url = url + commit + '/' + filename + '/' + row
|
|
Pierre-Yves Chibon |
444b61 |
if (tree_id) {
|
|
Pierre-Yves Chibon |
444b61 |
url += '?tree_id=' + tree_id;
|
|
Pierre-Yves Chibon |
444b61 |
}
|
|
Pierre-Yves Chibon |
9738dc |
var rowid = $(this).prev().find('a').attr('id');
|
|
Pierre-Yves Chibon |
c4550f |
var table = $( this ).parent().parent();
|
|
Pierre-Yves Chibon |
9738dc |
var nextid = rowid.replace('_' + row, '_' + (Number(row) + 1));
|
|
Pierre-Yves Chibon |
9738dc |
var next_row = table.find('#' + nextid).parent().parent();
|
|
Pierre-Yves Chibon |
fe0558 |
{# If we're at the last row, we won't be able to find the next_row
|
|
Pierre-Yves Chibon |
7d4496 |
therefore we need to add it manually #}
|
|
Pierre-Yves Chibon |
fe0558 |
if (next_row.length == 0) {
|
|
Pierre-Yves Chibon |
fe0558 |
table.find("tr:last").after(
|
|
Pierre-Yves Chibon |
fe0558 |
'');
|
|
Pierre-Yves Chibon |
fe0558 |
next_row = table.find('#' + nextid).parent().parent();
|
|
Pierre-Yves Chibon |
fe0558 |
}
|
|
Pierre-Yves Chibon |
c4550f |
if (next_row.prev().find('.pr_comment_form').length == 0){
|
|
Pierre-Yves Chibon |
267613 |
$.get( url , function( data ) {
|
|
Pierre-Yves Chibon |
be1f52 |
next_row.before(
|
|
Pierre-Yves Chibon |
ecba85 |
' \
|
|
Pierre-Yves Chibon |
ecba85 |
|
|
Pierre-Yves Chibon |
ecba85 |
+ data + '' );
|
|
Pierre-Yves Chibon |
bc01a9 |
cancel_edit_btn();
|
|
Pierre-Yves Chibon |
1a1f78 |
$(".prc").removeAttr("disabled");
|
|
Pierre-Yves Chibon |
53cff7 |
emoji_complete(json_url, folder);
|
|
Pierre-Yves Chibon |
267613 |
});
|
|
Pierre-Yves Chibon |
55a67c |
} else {
|
|
Pierre-Yves Chibon |
8ca3eb |
next_row.prev().find('.pr_comment_form').parent().remove();
|
|
Pierre-Yves Chibon |
1a1f78 |
$(".prc").removeAttr("disabled");
|
|
Pierre-Yves Chibon |
267613 |
}
|
|
Pierre-Yves Chibon |
267613 |
}
|
|
Pierre-Yves Chibon |
267613 |
);
|
|
Pierre-Yves Chibon |
b3904b |
|
|
Pierre-Yves Chibon |
62bb73 |
setup_edit_btns();
|
|
Pierre-Yves Chibon |
4350fb |
setup_reply_btns();
|
|
Pierre-Yves Chibon |
bc01a9 |
|
|
Farhaan Bukhsh |
725217 |
{% endif %}
|
|
Farhaan Bukhsh |
725217 |
|
|
Pierre-Yves Chibon |
55a4f2 |
{% if pull_request.status == 'Open' %}
|
|
Pierre-Yves Chibon |
d5c458 |
show_merge_status()
|
|
Pierre-Yves Chibon |
67b1ab |
{% endif %}
|
|
Pierre-Yves Chibon |
2e094d |
|
|
Pierre-Yves Chibon |
07f5d3 |
{% endif %}
|
|
Pierre-Yves Chibon |
267613 |
|
|
Pierre-Yves Chibon |
267613 |
});
|
|
Patrick Uiterwijk |
342340 |
|
|
Pierre-Yves Chibon |
b130e5 |
{% if g.authenticated and pull_request %}
|
|
Pierre-Yves Chibon |
b6c56b |
$('#assignee').selectize({
|
|
Pierre-Yves Chibon |
b6c56b |
valueField: 'user',
|
|
Pierre-Yves Chibon |
b6c56b |
labelField: 'user',
|
|
Pierre-Yves Chibon |
b6c56b |
searchField: 'user',
|
|
Pierre-Yves Chibon |
b6c56b |
maxItems: 1,
|
|
Pierre-Yves Chibon |
b6c56b |
create: false,
|
|
Pierre-Yves Chibon |
b6c56b |
load: function(query, callback) {
|
|
Pierre-Yves Chibon |
b6c56b |
if (!query.length) return callback();
|
|
Pierre-Yves Chibon |
b6c56b |
$.getJSON(
|
|
Pierre-Yves Chibon |
b6c56b |
"{{ url_for('api_ns.api_users') }}", {
|
|
Ryan Lerch |
6a3619 |
pattern: "*"+query+"*"
|
|
Pierre-Yves Chibon |
b6c56b |
},
|
|
Pierre-Yves Chibon |
b6c56b |
function( data ) {
|
|
Pierre-Yves Chibon |
b6c56b |
callback( data.users.map(function(x) { return { user: x }; }) );
|
|
Pierre-Yves Chibon |
b6c56b |
}
|
|
Pierre-Yves Chibon |
b6c56b |
);
|
|
Pierre-Yves Chibon |
b6c56b |
}
|
|
Pierre-Yves Chibon |
b6c56b |
});
|
|
Pierre-Yves Chibon |
b6c56b |
|
|
Pierre-Yves Chibon |
d5c458 |
$( ".editmetadatatoggle" ).click(
|
|
Pierre-Yves Chibon |
d5c458 |
function() {
|
|
Pierre-Yves Chibon |
d5c458 |
$( ".issue-metadata-form" ).toggle();
|
|
Pierre-Yves Chibon |
d5c458 |
$( ".issue-metadata-display" ).toggle();
|
|
Pierre-Yves Chibon |
d5c458 |
}
|
|
Pierre-Yves Chibon |
d5c458 |
);
|
|
Ryan Lerch |
e68db5 |
|
|
Pierre-Yves Chibon |
d5bca2 |
function set_ui_for_comment(setting){
|
|
Pierre-Yves Chibon |
d5bca2 |
if (setting == false) {
|
|
Pierre-Yves Chibon |
d5bca2 |
$(document.body).find('input[type="submit"]').removeAttr("disabled");
|
|
Pierre-Yves Chibon |
d5bca2 |
document.body.style.cursor = 'default';
|
|
Pierre-Yves Chibon |
d5bca2 |
} else {
|
|
Pierre-Yves Chibon |
d5bca2 |
$(document.body).find('input[type="submit"]').attr("disabled", "disabled");
|
|
Pierre-Yves Chibon |
d5bca2 |
document.body.style.cursor = 'wait';
|
|
Pierre-Yves Chibon |
d5bca2 |
}
|
|
Pierre-Yves Chibon |
d5bca2 |
}
|
|
Pierre-Yves Chibon |
d5bca2 |
|
|
Pierre-Yves Chibon |
8821f7 |
$("#merge_pr_form").submit( function() {
|
|
Pierre-Yves Chibon |
8821f7 |
set_ui_for_comment(true);
|
|
Pierre-Yves Chibon |
8821f7 |
var _c = $("#comment");
|
|
Pierre-Yves Chibon |
8821f7 |
if (_c.val()) {
|
|
Pierre-Yves Chibon |
8821f7 |
$('<input>').attr('type', 'hidden')
|
|
Pierre-Yves Chibon |
8821f7 |
.attr('name', "comment")
|
|
Pierre-Yves Chibon |
8821f7 |
.attr('value', _c.val())
|
|
Pierre-Yves Chibon |
8821f7 |
.appendTo(this);
|
|
Pierre-Yves Chibon |
8821f7 |
}
|
|
Pierre-Yves Chibon |
8821f7 |
return true;
|
|
Pierre-Yves Chibon |
8821f7 |
});
|
|
Pierre-Yves Chibon |
8821f7 |
|
|
Pierre-Yves Chibon |
32cff5 |
function try_async_comment(form, inline) {
|
|
Pierre-Yves Chibon |
d5bca2 |
set_ui_for_comment(true);
|
|
Pierre-Yves Chibon |
62bb73 |
var _data = $(form).serialize();
|
|
Pierre-Yves Chibon |
62bb73 |
var btn = $(document.activeElement);
|
|
Pierre-Yves Chibon |
62bb73 |
if (btn[0].name == 'drop_comment'){
|
|
Pierre-Yves Chibon |
62bb73 |
_data += '&drop_comment=' + btn[0].value;
|
|
Pierre-Yves Chibon |
d5bca2 |
set_ui_for_comment(false);
|
|
Pierre-Yves Chibon |
62bb73 |
return true;
|
|
Pierre-Yves Chibon |
62bb73 |
}
|
|
Julen Landa Alustiza |
040c6e |
var _url = form.attr("action");
|
|
Pierre-Yves Chibon |
358d41 |
if (_url.indexOf('?') != -1){
|
|
Pierre-Yves Chibon |
358d41 |
_url += "&js=1";
|
|
Pierre-Yves Chibon |
358d41 |
} else {
|
|
Pierre-Yves Chibon |
358d41 |
_url += "?js=1";
|
|
Pierre-Yves Chibon |
358d41 |
}
|
|
Pierre-Yves Chibon |
df52cc |
|
|
Pierre-Yves Chibon |
df52cc |
/* Keep some variable in memory before sending them in case the SSE is down */
|
|
Pierre-Yves Chibon |
e32184 |
var _update = false;
|
|
Julen Landa Alustiza |
607c63 |
var _comment = inline ? $(form).find('#inline-comment').val() : $(form).find('#comment').val();
|
|
Pierre-Yves Chibon |
e32184 |
var _comment_id = null;
|
|
Pierre-Yves Chibon |
e32184 |
if (!_comment && form.update_comment) {
|
|
Pierre-Yves Chibon |
e32184 |
_update = true;
|
|
Pierre-Yves Chibon |
e32184 |
_comment_id = $(form.edit_comment).val();
|
|
Pierre-Yves Chibon |
e32184 |
_comment = $(form).find('#update_comment').val();
|
|
Pierre-Yves Chibon |
e32184 |
}
|
|
Pierre-Yves Chibon |
df52cc |
var _commit_id = null;
|
|
Pierre-Yves Chibon |
df52cc |
var _line = null;
|
|
Pierre-Yves Chibon |
df52cc |
var _token = "{{ mergeform.csrf_token.current_token }}";
|
|
Pierre-Yves Chibon |
df52cc |
var _base_url = _url.split('?')[0];
|
|
Pierre-Yves Chibon |
df52cc |
if (!_base_url.match(/comment$/)){
|
|
Pierre-Yves Chibon |
df52cc |
_commit_id = _url.split('/comment/')[1];
|
|
Pierre-Yves Chibon |
df52cc |
_commit_id = _commit_id.split('/')[0];
|
|
Pierre-Yves Chibon |
df52cc |
|
|
Pierre-Yves Chibon |
df52cc |
items = _url.split('/');
|
|
Pierre-Yves Chibon |
df52cc |
_line = items[items.length -1];
|
|
Pierre-Yves Chibon |
df52cc |
}
|
|
Pierre-Yves Chibon |
df52cc |
|
|
Pierre-Yves Chibon |
358d41 |
$.post( _url, $(form).serialize() )
|
|
Patrick Uiterwijk |
342340 |
.done(function(data) {
|
|
Patrick Uiterwijk |
342340 |
if(data == 'ok') {
|
|
Pierre-Yves Chibon |
62bb73 |
$('#comment').val('');
|
|
Pierre-Yves Chibon |
48f7d0 |
$('#preview').html('');
|
|
Pierre-Yves Chibon |
48f7d0 |
$('#previewinmarkdown').addClass('inactive');
|
|
Pierre-Yves Chibon |
48f7d0 |
$('#previewinmarkdown').removeClass('active');
|
|
Pierre-Yves Chibon |
48f7d0 |
$('#preview').hide();
|
|
Pierre-Yves Chibon |
48f7d0 |
$('#comment').show();
|
|
Pierre-Yves Chibon |
62bb73 |
/* We have submitted the comment correctly */
|
|
Pierre-Yves Chibon |
279d4c |
var item = $('.pr_comment_form').closest('tr');
|
|
Pierre-Yves Chibon |
020f4c |
if (!$(item.parent().children()[1]).is(':visible')){
|
|
Pierre-Yves Chibon |
020f4c |
$(item.parent().children()[1]).show()
|
|
Pierre-Yves Chibon |
32cff5 |
}
|
|
Pierre-Yves Chibon |
020f4c |
item.remove();
|
|
Pierre-Yves Chibon |
c3b433 |
if (!sse) {
|
|
Pierre-Yves Chibon |
e32184 |
if (!_comment){
|
|
Pierre-Yves Chibon |
e32184 |
// Make the browser submit the form sync
|
|
Pierre-Yves Chibon |
e32184 |
form.submit();
|
|
Pierre-Yves Chibon |
e32184 |
}
|
|
Pierre-Yves Chibon |
df52cc |
console.log('no sse, adding the comment manually');
|
|
Pierre-Yves Chibon |
df52cc |
$.ajax({
|
|
Pierre-Yves Chibon |
df52cc |
url: "{{ url_for('ui_ns.markdown_preview') }}" ,
|
|
Pierre-Yves Chibon |
df52cc |
type: 'POST',
|
|
Pierre-Yves Chibon |
df52cc |
data: {
|
|
Pierre-Yves Chibon |
df52cc |
content: _comment,
|
|
Pierre-Yves Chibon |
df52cc |
csrf_token: _token,
|
|
Pierre-Yves Chibon |
df52cc |
},
|
|
Pierre-Yves Chibon |
df52cc |
dataType: 'html',
|
|
Pierre-Yves Chibon |
df52cc |
success: function(res) {
|
|
Pierre-Yves Chibon |
df52cc |
var _comment = emojione.toImage(res);
|
|
Pierre-Yves Chibon |
e32184 |
if (_update) {
|
|
Pierre-Yves Chibon |
e32184 |
var data = {
|
|
Pierre-Yves Chibon |
e32184 |
comment_updated: _comment,
|
|
Pierre-Yves Chibon |
e32184 |
comment_user: "{{ g.fas_user.username }}",
|
|
Pierre-Yves Chibon |
e32184 |
comment_date: Date.now(),
|
|
Pierre-Yves Chibon |
e32184 |
comment_id: _comment_id,
|
|
Pierre-Yves Chibon |
e32184 |
avatar_url: "{{ g.fas_user.email | avatar_url(16) }}",
|
|
Pierre-Yves Chibon |
e32184 |
}
|
|
Pierre-Yves Chibon |
e32184 |
} else {
|
|
Pierre-Yves Chibon |
e32184 |
var data = {
|
|
Pierre-Yves Chibon |
df52cc |
comment_added: _comment,
|
|
Pierre-Yves Chibon |
df52cc |
comment_user: "{{ g.fas_user.username }}",
|
|
Pierre-Yves Chibon |
df52cc |
comment_date: Date.now(),
|
|
Pierre-Yves Chibon |
df52cc |
avatar_url: "{{ g.fas_user.email | avatar_url(16) }}",
|
|
Pierre-Yves Chibon |
df52cc |
commit_id: _commit_id,
|
|
Pierre-Yves Chibon |
df52cc |
line: _line,
|
|
Pierre-Yves Chibon |
e32184 |
}
|
|
Pierre-Yves Chibon |
df52cc |
}
|
|
Pierre-Yves Chibon |
df52cc |
process_event(
|
|
Pierre-Yves Chibon |
df52cc |
data,
|
|
Pierre-Yves Chibon |
df52cc |
"{{ request.uid }}",
|
|
Pierre-Yves Chibon |
df52cc |
"{{ g.fas_user.username if g.authenticated or '' }}");
|
|
Pierre-Yves Chibon |
df52cc |
set_ui_for_comment(false);
|
|
Pierre-Yves Chibon |
e3c816 |
setup_reply_btns()
|
|
Pierre-Yves Chibon |
df52cc |
return false;
|
|
Pierre-Yves Chibon |
df52cc |
}
|
|
Pierre-Yves Chibon |
df52cc |
});
|
|
Pierre-Yves Chibon |
df52cc |
return false;
|
|
Pierre-Yves Chibon |
df52cc |
} else {
|
|
Pierre-Yves Chibon |
df52cc |
set_ui_for_comment(false);
|
|
Pierre-Yves Chibon |
df52cc |
}
|
|
Patrick Uiterwijk |
342340 |
} else {
|
|
Patrick Uiterwijk |
342340 |
// Make the browser submit the form sync
|
|
Patrick Uiterwijk |
342340 |
form.submit();
|
|
Patrick Uiterwijk |
342340 |
}
|
|
Patrick Uiterwijk |
342340 |
})
|
|
Patrick Uiterwijk |
342340 |
.fail(function() {
|
|
Patrick Uiterwijk |
342340 |
// Make the browser submit the form sync
|
|
Patrick Uiterwijk |
342340 |
form.submit();
|
|
Patrick Uiterwijk |
342340 |
})
|
|
Patrick Uiterwijk |
342340 |
return false;
|
|
Patrick Uiterwijk |
342340 |
};
|
|
Julen Landa Alustiza |
2db43b |
|
|
Julen Landa Alustiza |
2db43b |
$(".add_comment_form").submit(function(event) {
|
|
Julen Landa Alustiza |
a60b72 |
return try_async_comment($(this), true);
|
|
Julen Landa Alustiza |
2db43b |
})
|
|
Julen Landa Alustiza |
2db43b |
|
|
Patrick Uiterwijk |
342340 |
{% endif %}
|
|
Patrick Uiterwijk |
342340 |
|
|
Pierre-Yves Chibon |
267613 |
|
|
Pierre-Yves Chibon |
20621e |
|
|
Pierre-Yves Chibon |
7694ed |
<script nonce="{{ g.nonce }}" type="text/javascript"></script>
|
|
Pierre-Yves Chibon |
c14ec6 |
var cur_hash = null;
|
|
Pierre-Yves Chibon |
c14ec6 |
|
|
Pierre-Yves Chibon |
3ff704 |
function color_tags() {
|
|
Pierre-Yves Chibon |
3ff704 |
$(".badge-tag").each(function(ind, obj) {
|
|
Pierre-Yves Chibon |
3ff704 |
$(obj).css('background-color', $(obj).attr('data-bg-color'));
|
|
Pierre-Yves Chibon |
3ff704 |
});
|
|
Pierre-Yves Chibon |
3ff704 |
}
|
|
Pierre-Yves Chibon |
3ff704 |
|
|
Pierre-Yves Chibon |
c14ec6 |
function highlight_comment() {
|
|
Pierre-Yves Chibon |
c14ec6 |
var _hash = window.location.hash;
|
|
Pierre-Yves Chibon |
c14ec6 |
if (_hash != cur_hash) {
|
|
Pierre-Yves Chibon |
c14ec6 |
$( cur_hash ).css(
|
|
Pierre-Yves Chibon |
c14ec6 |
"background", "linear-gradient(to bottom, #ededed 0%, #fff 100%)"
|
|
Pierre-Yves Chibon |
c14ec6 |
);
|
|
Pierre-Yves Chibon |
c14ec6 |
};
|
|
Pierre-Yves Chibon |
c14ec6 |
cur_hash = _hash;
|
|
Pierre-Yves Chibon |
c14ec6 |
if ( _hash ) {
|
|
Pierre-Yves Chibon |
c14ec6 |
$( _hash ).css(
|
|
Pierre-Yves Chibon |
c14ec6 |
"background", "linear-gradient(to bottom, #eded98 0%, #fff 100%)"
|
|
Pierre-Yves Chibon |
c14ec6 |
);
|
|
Pierre-Yves Chibon |
c14ec6 |
};
|
|
Pierre-Yves Chibon |
c14ec6 |
return false;
|
|
Pierre-Yves Chibon |
c14ec6 |
};
|
|
Pierre-Yves Chibon |
c14ec6 |
|
|
Pierre-Yves Chibon |
e3abb3 |
function updateHighlight(onload) {
|
|
Pierre-Yves Chibon |
11eec1 |
var cls = "highlighted-line";
|
|
Pierre-Yves Chibon |
11eec1 |
$('.' + cls).removeClass(cls)
|
|
Pierre-Yves Chibon |
c14ec6 |
if (location.hash === '') {
|
|
Lubomír Sedlář |
a9321f |
// Display comments when the hash is removed.
|
|
Lubomír Sedlář |
a9321f |
$('#pr-tabs .nav-item a.nav-link, #pr-wrapper .tab-pane').removeClass('active');
|
|
Lubomír Sedlář |
a9321f |
$('#comments, [href="#comments"]').addClass('active');
|
|
Pierre-Yves Chibon |
c14ec6 |
return
|
|
Pierre-Yves Chibon |
c14ec6 |
}
|
|
Pierre-Yves Chibon |
c14ec6 |
if (location.hash.indexOf("comment-") > -1) {
|
|
Pierre-Yves Chibon |
c14ec6 |
highlight_comment();
|
|
Pierre-Yves Chibon |
c14ec6 |
} else {
|
|
Pierre-Yves Chibon |
e3abb3 |
if (onload) {
|
|
cep |
a8a752 |
// Hide all tabs, and then show the one pointed to by the hash.
|
|
cep |
a8a752 |
// This is neccessary to handle 'Back' button presses in the browser,
|
|
cep |
a8a752 |
// which otherwise break the tabs view .
|
|
cep |
a8a752 |
$('#pr-tabs .nav-item a.nav-link').removeClass('active');
|
|
cep |
a8a752 |
$('#pr-wrapper .tab-pane').removeClass('active');
|
|
cep |
a8a752 |
// When the hash points to 'Files Changed' tab, or a highlight.
|
|
cep |
a8a752 |
if (location.hash.indexOf("request_diff") > -1 ||
|
|
Pradeep CE (cep) |
e8b316 |
location.hash.indexOf("_") === 1 ||
|
|
Pradeep CE (cep) |
e8b316 |
location.hash.indexOf("c-") === 1) {
|
|
Pierre-Yves Chibon |
e3abb3 |
$('[href="#request_diff"]').addClass('active');
|
|
cep |
473048 |
$('#request_diff').addClass('active');
|
|
cep |
473048 |
}
|
|
cep |
473048 |
// When the hash points to 'Commits' tab.
|
|
cep |
473048 |
else if (location.hash.indexOf("commit_list") > -1) {
|
|
cep |
473048 |
$('[href="#commit_list"]').addClass('active');
|
|
cep |
473048 |
$('#commit_list').addClass('active');
|
|
cep |
473048 |
}
|
|
cep |
473048 |
// If neither, then show the 'Comments' tab by default.
|
|
cep |
473048 |
else {
|
|
cep |
473048 |
$('#comments').addClass('active');
|
|
cep |
473048 |
$('[href="#comments"]').addClass('active');
|
|
cep |
473048 |
}
|
|
Pierre-Yves Chibon |
e3abb3 |
}
|
|
Pierre-Yves Chibon |
f620a6 |
var file = parseInt(location.hash.substr(2).split('__')[0], 10);
|
|
Julen Landa Alustiza |
f9d949 |
if (file)
|
|
Julen Landa Alustiza |
f9d949 |
{
|
|
Julen Landa Alustiza |
f9d949 |
var lines = location.hash.split('__')[1].split('-').map(function (x) { return parseInt(x, 10) });
|
|
Julen Landa Alustiza |
f9d949 |
for (var i = lines[lines.length - 1]; i >= lines[0]; i--) {
|
|
Julen Landa Alustiza |
f9d949 |
$('#' + '_' + file + '__' + i).closest('tr').addClass(cls);
|
|
Julen Landa Alustiza |
f9d949 |
}
|
|
Pierre-Yves Chibon |
11eec1 |
}
|
|
Pierre-Yves Chibon |
11eec1 |
}
|
|
Pierre-Yves Chibon |
11eec1 |
}
|
|
Pierre-Yves Chibon |
87bd79 |
|
|
Ryan Lerch |
02738b |
$(document).ready(function () {
|
|
Pierre-Yves Chibon |
3ff704 |
color_tags();
|
|
Pierre-Yves Chibon |
3ff704 |
|
|
Pierre-Yves Chibon |
335a73 |
{% if g.authenticated and pull_request %}
|
|
Pierre-Yves Chibon |
4f5301 |
function set_up_subcribed() {
|
|
Pierre-Yves Chibon |
4f5301 |
$("#subcribe-btn").click(function(){
|
|
Pierre-Yves Chibon |
4f5301 |
var _url = "{{ url_for(
|
|
Pierre-Yves Chibon |
4f5301 |
'api_ns.api_subscribe_pull_request',
|
|
Pierre-Yves Chibon |
4f5301 |
repo=repo.name,
|
|
Pierre-Yves Chibon |
04eb13 |
username=repo.user.user if repo.is_fork else None,
|
|
Pierre-Yves Chibon |
4f5301 |
namespace=repo.namespace,
|
|
Pierre-Yves Chibon |
4f5301 |
requestid=pull_request.id
|
|
Pierre-Yves Chibon |
4f5301 |
) }}";
|
|
Pierre-Yves Chibon |
4f5301 |
var _btn = $("#subcribe-btn");
|
|
Pierre-Yves Chibon |
4f5301 |
var _data = {};
|
|
Pierre-Yves Chibon |
4f5301 |
if (_btn.text() == 'Unsubscribe'){
|
|
Pierre-Yves Chibon |
4f5301 |
_data.status = false;
|
|
Pierre-Yves Chibon |
4f5301 |
} else {
|
|
Pierre-Yves Chibon |
4f5301 |
_data.status = true;
|
|
Pierre-Yves Chibon |
4f5301 |
}
|
|
Pierre-Yves Chibon |
4f5301 |
console.log(_data);
|
|
Pierre-Yves Chibon |
4f5301 |
$.post( _url, _data ).done(
|
|
Pierre-Yves Chibon |
4f5301 |
function(data) {
|
|
Pierre-Yves Chibon |
4f5301 |
var _btn = $("#subcribe-btn");
|
|
Ryan Lerch |
5682fd |
var _countlabel = $("#subscribers-count")
|
|
Ryan Lerch |
5682fd |
var _count = parseInt(_countlabel.text())
|
|
Pierre-Yves Chibon |
4f5301 |
if (_btn.text() == 'Subscribe'){
|
|
Pierre-Yves Chibon |
4f5301 |
_btn.text('Unsubscribe');
|
|
Ryan Lerch |
5682fd |
_countlabel.text(_count+1)
|
|
Ryan Lerch |
5682fd |
var _html = '
|
|
Ryan Lerch |
5682fd |
+ 'title="'+data.user+'" id="sub-avatar-'+data.user+'">'
|
|
Ryan Lerch |
5682fd |
+ '';
|
|
Ryan Lerch |
5682fd |
$('#subscribers_list').prepend(_html);
|
|
Pierre-Yves Chibon |
4f5301 |
} else {
|
|
Pierre-Yves Chibon |
4f5301 |
_btn.text('Subscribe');
|
|
Ryan Lerch |
5682fd |
_countlabel.text(_count-1);
|
|
Ryan Lerch |
5682fd |
$('#sub-avatar-'+data.user).remove();
|
|
Pierre-Yves Chibon |
4f5301 |
}
|
|
Pierre-Yves Chibon |
4f5301 |
return false;
|
|
Pierre-Yves Chibon |
4f5301 |
}
|
|
Pierre-Yves Chibon |
4f5301 |
)
|
|
Pierre-Yves Chibon |
4f5301 |
return false;
|
|
Pierre-Yves Chibon |
4f5301 |
});
|
|
Pierre-Yves Chibon |
4f5301 |
};
|
|
Pierre-Yves Chibon |
4f5301 |
set_up_subcribed();
|
|
Pierre-Yves Chibon |
4f5301 |
{% endif %}
|
|
Pierre-Yves Chibon |
4f5301 |
|
|
Julen Landa Alustiza |
f9d949 |
updateHighlight(true);
|
|
Pierre-Yves Chibon |
23bf8d |
{% if form or pull_request %}
|
|
Pierre-Yves Chibon |
23bf8d |
$( "#preview" ).hide();
|
|
Ryan Lerch |
02738b |
$( "#previewinmarkdown" ).click(
|
|
Ryan Lerch |
02738b |
function(event, ui) {
|
|
Pierre-Yves Chibon |
23bf8d |
{% if form %}
|
|
Pierre-Yves Chibon |
23bf8d |
var _el = $( "#initial_comment" );
|
|
Pierre-Yves Chibon |
23bf8d |
var _token = "{{ form.csrf_token.current_token }}";
|
|
Pierre-Yves Chibon |
23bf8d |
{% else %}
|
|
Pierre-Yves Chibon |
23bf8d |
var _el = $( "#comment" );
|
|
Pierre-Yves Chibon |
23bf8d |
var _token = "{{ mergeform.csrf_token.current_token }}";
|
|
Pierre-Yves Chibon |
23bf8d |
{% endif %}
|
|
Pierre-Yves Chibon |
23bf8d |
|
|
Pierre-Yves Chibon |
23bf8d |
var _text = _el.val();
|
|
Pierre-Yves Chibon |
b130e5 |
var _url = "{{ url_for('ui_ns.markdown_preview') }}";
|
|
Ryan Lerch |
02738b |
$.ajax({
|
|
Ryan Lerch |
02738b |
url: _url ,
|
|
Ryan Lerch |
02738b |
type: 'POST',
|
|
Ryan Lerch |
02738b |
data: {
|
|
Ryan Lerch |
02738b |
content: _text,
|
|
Pierre-Yves Chibon |
23bf8d |
csrf_token: _token,
|
|
Ryan Lerch |
02738b |
},
|
|
Ryan Lerch |
02738b |
dataType: 'html',
|
|
Ryan Lerch |
02738b |
success: function(res) {
|
|
Ryan Lerch |
02738b |
var preview = emojione.toImage(res);
|
|
Ryan Lerch |
02738b |
$( "#preview" ).html(preview);
|
|
Alexander Scheel |
4d6c41 |
$( "#previewinmarkdown" ).addClass("active");
|
|
Alexander Scheel |
4d6c41 |
$( "#editinmarkdown" ).removeClass("active");
|
|
Pierre-Yves Chibon |
23bf8d |
_el.hide();
|
|
Ryan Lerch |
02738b |
$( "#preview" ).show();
|
|
Ryan Lerch |
02738b |
},
|
|
Ryan Lerch |
02738b |
error: function() {
|
|
Ryan Lerch |
02738b |
alert('Unable to generate preview!'+error);
|
|
Ryan Lerch |
02738b |
}
|
|
Ryan Lerch |
02738b |
});
|
|
Ryan Lerch |
02738b |
return false;
|
|
Ryan Lerch |
2aa95c |
}
|
|
Ryan Lerch |
2aa95c |
);
|
|
Ryan Lerch |
2aa95c |
|
|
Ryan Lerch |
2aa95c |
$( "#editinmarkdown" ).click(
|
|
Ryan Lerch |
2aa95c |
function(event, ui) {
|
|
Ryan Lerch |
2aa95c |
{% if form %}
|
|
Ryan Lerch |
2aa95c |
var _el = $( "#initial_comment" );
|
|
Ryan Lerch |
2aa95c |
var _token = "{{ form.csrf_token.current_token }}";
|
|
Ryan Lerch |
2aa95c |
{% else %}
|
|
Ryan Lerch |
2aa95c |
var _el = $( "#comment" );
|
|
Ryan Lerch |
2aa95c |
var _token = "{{ mergeform.csrf_token.current_token }}";
|
|
Ryan Lerch |
2aa95c |
{% endif %}
|
|
Ryan Lerch |
2aa95c |
|
|
Alexander Scheel |
4d6c41 |
$( "#editinmarkdown" ).addClass("active");
|
|
Alexander Scheel |
4d6c41 |
$( "#previewinmarkdown" ).removeClass("active");
|
|
Ryan Lerch |
2aa95c |
_el.show();
|
|
Ryan Lerch |
2aa95c |
$( "#preview" ).hide();
|
|
Ryan Lerch |
02738b |
}
|
|
Ryan Lerch |
02738b |
);
|
|
Eric Barbour |
587cb9 |
{% endif %}
|
|
Pierre-Yves Chibon |
23bf8d |
|
|
Pierre-Yves Chibon |
23bf8d |
$.get("{{ url_for('api_ns.api_users') }}", {
|
|
Pierre-Yves Chibon |
23bf8d |
pattern: '*'
|
|
Pierre-Yves Chibon |
23bf8d |
}).done(function(resp) {
|
|
Pierre-Yves Chibon |
23bf8d |
var userConfig = {
|
|
Pierre-Yves Chibon |
23bf8d |
at: '@',
|
|
Pierre-Yves Chibon |
23bf8d |
data: resp['mention'],
|
|
Pierre-Yves Chibon |
23bf8d |
insertTpl: '@${username}',
|
|
Pierre-Yves Chibon |
23bf8d |
displayTpl: " ${username} <small>${name}</small>",
|
|
Pierre-Yves Chibon |
23bf8d |
searchKey: "username"
|
|
Pierre-Yves Chibon |
23bf8d |
}
|
|
Pierre-Yves Chibon |
23bf8d |
$("#comment").atwho(userConfig);
|
|
Pierre-Yves Chibon |
23bf8d |
$("#initial_comment").atwho(userConfig);
|
|
Pierre-Yves Chibon |
23bf8d |
});
|
|
Vivek Anand |
a79472 |
|
|
Pierre-Yves Chibon |
dae482 |
$.when(
|
|
Pierre-Yves Chibon |
cd4df4 |
{%- if g.issues_enabled %}
|
|
Pierre-Yves Chibon |
dae482 |
$.get("{{ url_for('api_ns.api_view_issues',
|
|
Pierre-Yves Chibon |
dae482 |
repo=repo.name,
|
|
Pierre-Yves Chibon |
04eb13 |
username=repo.user.user if repo.is_fork else None,
|
|
Pierre-Yves Chibon |
dae482 |
namespace=repo.namespace,
|
|
Pierre-Yves Chibon |
dae482 |
status='all') }}"),
|
|
Pierre-Yves Chibon |
dae482 |
{%- else %}
|
|
Pierre-Yves Chibon |
dae482 |
{},
|
|
Pierre-Yves Chibon |
dae482 |
{%- endif %}
|
|
Pierre-Yves Chibon |
dae482 |
{%- if repo.settings.get('pull_requests', True) %}
|
|
Pierre-Yves Chibon |
dae482 |
$.get("{{ url_for('api_ns.api_pull_request_views',
|
|
Pierre-Yves Chibon |
dae482 |
repo=repo.name,
|
|
Pierre-Yves Chibon |
04eb13 |
username=repo.user.user if repo.is_fork else None,
|
|
Pierre-Yves Chibon |
dae482 |
namespace=repo.namespace,
|
|
Pierre-Yves Chibon |
dae482 |
status='all') }}")
|
|
Pierre-Yves Chibon |
dae482 |
{%- else %}
|
|
Pierre-Yves Chibon |
dae482 |
{}
|
|
Pierre-Yves Chibon |
dae482 |
{%- endif %}
|
|
Pierre-Yves Chibon |
dae482 |
).done(function(issuesResp, prResp) {
|
|
Pierre-Yves Chibon |
dae482 |
// 0 is the api response
|
|
Pierre-Yves Chibon |
dae482 |
var issuesAndPrs = [];
|
|
Pierre-Yves Chibon |
dae482 |
if (typeof issuesResp[0] !== 'undefined') {
|
|
Pierre-Yves Chibon |
dae482 |
issuesAndPrs = issuesAndPrs.concat(issuesResp[0]['issues']);
|
|
Pierre-Yves Chibon |
dae482 |
}
|
|
Pierre-Yves Chibon |
dae482 |
if (typeof prResp[0] !== 'undefined') {
|
|
Pierre-Yves Chibon |
dae482 |
issuesAndPrs = issuesAndPrs.concat(prResp[0]['requests']);
|
|
Pierre-Yves Chibon |
dae482 |
}
|
|
Pierre-Yves Chibon |
dae482 |
var data = $.map(issuesAndPrs, function(ticket, idx) {
|
|
Pierre-Yves Chibon |
dae482 |
return {
|
|
Pierre-Yves Chibon |
dae482 |
name: ticket.id.toString(),
|
|
Pierre-Yves Chibon |
dae482 |
title: $('').text(ticket.title).html()
|
|
Pierre-Yves Chibon |
dae482 |
}
|
|
Pierre-Yves Chibon |
dae482 |
});
|
|
Pierre-Yves Chibon |
dae482 |
var issueAndPrConfig = {
|
|
Pierre-Yves Chibon |
dae482 |
at: '#',
|
|
Pierre-Yves Chibon |
dae482 |
data: data,
|
|
Pierre-Yves Chibon |
dae482 |
insertTpl: '#${name}',
|
|
Pierre-Yves Chibon |
dae482 |
displayTpl: "#${name}<small> ${title}</small>",
|
|
Pierre-Yves Chibon |
dae482 |
}
|
|
Pierre-Yves Chibon |
dae482 |
$("#comment").atwho(issueAndPrConfig);
|
|
Pierre-Yves Chibon |
dae482 |
$("#initial_comment").atwho(issueAndPrConfig);
|
|
Pierre-Yves Chibon |
dae482 |
});
|
|
Pierre-Yves Chibon |
c29244 |
|
|
Pierre-Yves Chibon |
c29244 |
var available_tags = [];
|
|
Pierre-Yves Chibon |
c29244 |
{%for tog in tag_list %}
|
|
Pierre-Yves Chibon |
c29244 |
available_tags.push("{{tog.tag}}");
|
|
Pierre-Yves Chibon |
c29244 |
{%endfor%}
|
|
Pierre-Yves Chibon |
c29244 |
var items = available_tags.map(function(x) { return { item: x }; });
|
|
Pierre-Yves Chibon |
c29244 |
|
|
Pierre-Yves Chibon |
c29244 |
$('#tag').selectize({
|
|
Pierre-Yves Chibon |
c29244 |
delimiter: ',',
|
|
Pierre-Yves Chibon |
c29244 |
options: items,
|
|
Pierre-Yves Chibon |
c29244 |
persist: false,
|
|
Pierre-Yves Chibon |
c29244 |
create: false,
|
|
Pierre-Yves Chibon |
c29244 |
labelField: "item",
|
|
Pierre-Yves Chibon |
c29244 |
valueField: "item",
|
|
Pierre-Yves Chibon |
c29244 |
searchField: ["item"],
|
|
Pierre-Yves Chibon |
c29244 |
});
|
|
Pierre-Yves Chibon |
c29244 |
|
|
Ryan Lerch |
02738b |
} );
|
|
Pierre-Yves Chibon |
87bd79 |
|
|
Pierre-Yves Chibon |
11eec1 |
$(window).on('hashchange', updateHighlight);
|
|
Pierre-Yves Chibon |
87bd79 |
|
|
Pierre-Yves Chibon |
11eec1 |
var selected = [];
|
|
Pierre-Yves Chibon |
11eec1 |
$("[data-line-number]").click(function (ev) {
|
|
Pierre-Yves Chibon |
11eec1 |
var line = $(this).attr('data-line-number');
|
|
Pierre-Yves Chibon |
f620a6 |
var file = $(this).attr('data-file-number');
|
|
Pierre-Yves Chibon |
11eec1 |
if (ev.shiftKey) {
|
|
Pierre-Yves Chibon |
11eec1 |
selected = selected.slice(-1).concat(line);
|
|
Pierre-Yves Chibon |
11eec1 |
} else {
|
|
Pierre-Yves Chibon |
11eec1 |
selected = [line];
|
|
Pierre-Yves Chibon |
11eec1 |
}
|
|
Pierre-Yves Chibon |
11eec1 |
|
|
Pierre-Yves Chibon |
f620a6 |
var hash = '_' + file + '__' + selected[0];
|
|
Pierre-Yves Chibon |
11eec1 |
if (selected.length === 2) {
|
|
Pierre-Yves Chibon |
f620a6 |
hash = '_' + file + '__' + Math.min(selected[0], selected[1]) + '-' + Math.max(selected[0], selected[1]);
|
|
Pierre-Yves Chibon |
11eec1 |
}
|
|
Pierre-Yves Chibon |
11eec1 |
window.location.hash = hash;
|
|
Pierre-Yves Chibon |
11eec1 |
return false;
|
|
Pierre-Yves Chibon |
11eec1 |
});
|
|
cep |
efc3dc |
|
|
cep |
efc3dc |
// Update hash links in the addressbar according to which tab is clicked
|
|
cep |
efc3dc |
// on the PR page.
|
|
cep |
efc3dc |
$(document).on('click', '#pr-tabs a', function() {
|
|
Pierre-Yves Chibon |
87bd79 |
if ($(this).text().trim() == 'Comments' || $(this).text().trim() == 'Patch'){
|
|
Pierre-Yves Chibon |
87bd79 |
window.location.hash = '';
|
|
Pierre-Yves Chibon |
87bd79 |
} else {
|
|
Pierre-Yves Chibon |
87bd79 |
window.location.hash = $(this).attr('href');
|
|
Pierre-Yves Chibon |
87bd79 |
}
|
|
cep |
efc3dc |
});
|
|
Pradeep CE (cep) |
208647 |
|
|
Pradeep CE (cep) |
208647 |
// Show an icon to open the changed file, when the user hovers over the
|
|
Pradeep CE (cep) |
208647 |
// @@ -x,y +x,y @@ line in the diff. Clicking this icon opens the file (at the
|
|
Pradeep CE (cep) |
208647 |
// relevant line number) in a new tab.
|
|
Pradeep CE (cep) |
208647 |
$(document).on("mouseenter", "td.cell2", function(){
|
|
Pierre-Yves Chibon |
87bd79 |
$(this).find("a.open_changed_file_icon_wrap").css('visibility', 'visible');
|
|
Pradeep CE (cep) |
208647 |
});
|
|
Pradeep CE (cep) |
208647 |
$(document).on("mouseleave", "td.cell2", function() {
|
|
Pradeep CE (cep) |
208647 |
$(this).find("a.open_changed_file_icon_wrap").css('visibility', 'hidden');
|
|
Pradeep CE (cep) |
208647 |
});
|
|
Pierre-Yves Chibon |
627fb1 |
|
|
Pierre-Yves Chibon |
627fb1 |
{% if g.authenticated and (g.repo_user or pull_request.user.user == g.fas_user.username or open_access) %}
|
|
Pierre-Yves Chibon |
627fb1 |
function take_issue(){
|
|
Pierre-Yves Chibon |
627fb1 |
var _url = "{{ url_for('api_ns.api_pull_request_assign',
|
|
Pierre-Yves Chibon |
627fb1 |
repo=repo.name, namespace=repo.namespace, username=username,
|
|
Pierre-Yves Chibon |
627fb1 |
requestid=requestid) }}";
|
|
Pierre-Yves Chibon |
627fb1 |
var _data = {assignee: "{{ g.fas_user.username }}"};
|
|
Pierre-Yves Chibon |
627fb1 |
$.post (_url, _data ).done(
|
|
Pierre-Yves Chibon |
627fb1 |
function(data) {
|
|
Pierre-Yves Chibon |
627fb1 |
var _user_url = '\n{{g.fas_user.username| avatar(size=24) | safe}} '
|
|
Pierre-Yves Chibon |
627fb1 |
+ '
|
|
Pierre-Yves Chibon |
627fb1 |
+ '?assignee={{ g.fas_user.username }}">'
|
|
Pierre-Yves Chibon |
627fb1 |
+ '{{ g.fas_user.username }}'
|
|
Pierre-Yves Chibon |
3ff704 |
+ ' — Drop';
|
|
Pierre-Yves Chibon |
627fb1 |
$('#assignee_plain').html(_user_url);
|
|
Pierre-Yves Chibon |
627fb1 |
$('#assignee').val("{{ g.fas_user.username }}");
|
|
Pierre-Yves Chibon |
627fb1 |
setup_btn_take_drop();
|
|
Pierre-Yves Chibon |
627fb1 |
}
|
|
Pierre-Yves Chibon |
627fb1 |
).fail(function() {
|
|
Pierre-Yves Chibon |
627fb1 |
alert( "An error occured, could not assign this pull-request to you." );
|
|
Pierre-Yves Chibon |
627fb1 |
})
|
|
Pierre-Yves Chibon |
627fb1 |
return false;
|
|
Pierre-Yves Chibon |
627fb1 |
}
|
|
Pierre-Yves Chibon |
627fb1 |
{% endif %}
|
|
Pierre-Yves Chibon |
627fb1 |
|
|
Pierre-Yves Chibon |
627fb1 |
{% if g.authenticated and (
|
|
Pierre-Yves Chibon |
627fb1 |
g.repo_user
|
|
Pierre-Yves Chibon |
627fb1 |
or pull_request.user.user == g.fas_user.username
|
|
Pierre-Yves Chibon |
627fb1 |
or pull_request.assignee.user == g.fas_user.username) %}
|
|
Pierre-Yves Chibon |
627fb1 |
function drop_issue(){
|
|
Pierre-Yves Chibon |
627fb1 |
var _url = "{{ url_for('api_ns.api_pull_request_assign',
|
|
Pierre-Yves Chibon |
627fb1 |
repo=repo.name, namespace=repo.namespace, username=username,
|
|
Pierre-Yves Chibon |
627fb1 |
requestid=requestid) }}";
|
|
Pierre-Yves Chibon |
627fb1 |
var _data = {assignee: ""};
|
|
Pierre-Yves Chibon |
627fb1 |
$.post( _url, _data ).done(
|
|
Pierre-Yves Chibon |
627fb1 |
function(data) {
|
|
Pierre-Yves Chibon |
627fb1 |
var _user_url = '\nNone'
|
|
Pierre-Yves Chibon |
3ff704 |
+ ' — Take';
|
|
Pierre-Yves Chibon |
627fb1 |
$('#assignee_plain').html(_user_url);
|
|
Pierre-Yves Chibon |
627fb1 |
$('#assignee').val("");
|
|
Pierre-Yves Chibon |
627fb1 |
setup_btn_take_drop();
|
|
Pierre-Yves Chibon |
627fb1 |
}
|
|
Pierre-Yves Chibon |
627fb1 |
).fail(function() {
|
|
Pierre-Yves Chibon |
627fb1 |
alert( "An error occured, could not drop the current assignee." );
|
|
Pierre-Yves Chibon |
627fb1 |
})
|
|
Pierre-Yves Chibon |
627fb1 |
return false;
|
|
Pierre-Yves Chibon |
627fb1 |
}
|
|
Pierre-Yves Chibon |
627fb1 |
{% endif %}
|
|
Pierre-Yves Chibon |
627fb1 |
|
|
Pierre-Yves Chibon |
627fb1 |
function setup_btn_take_drop(){
|
|
Pierre-Yves Chibon |
627fb1 |
{% if g.authenticated and g.repo_user %}
|
|
Pierre-Yves Chibon |
627fb1 |
$("#take-btn").click(take_issue)
|
|
Pierre-Yves Chibon |
627fb1 |
{% endif %}
|
|
Pierre-Yves Chibon |
627fb1 |
{% if g.authenticated and (
|
|
Pierre-Yves Chibon |
627fb1 |
g.repo_user
|
|
Pierre-Yves Chibon |
627fb1 |
or pull_request.user.user == g.fas_user.username
|
|
Pierre-Yves Chibon |
627fb1 |
or pull_request.assignee.user == g.fas_user.username) %}
|
|
Pierre-Yves Chibon |
627fb1 |
$("#drop-btn").click(drop_issue);
|
|
Pierre-Yves Chibon |
627fb1 |
{% endif %}
|
|
Pierre-Yves Chibon |
627fb1 |
}
|
|
Pierre-Yves Chibon |
627fb1 |
|
|
Pierre-Yves Chibon |
627fb1 |
{% if g.authenticated and (
|
|
Pierre-Yves Chibon |
627fb1 |
g.repo_user
|
|
Pierre-Yves Chibon |
627fb1 |
or pull_request.user.user == g.fas_user.username
|
|
Pierre-Yves Chibon |
627fb1 |
or pull_request.assignee.user == g.fas_user.username) %}
|
|
Pierre-Yves Chibon |
627fb1 |
setup_btn_take_drop();
|
|
Pierre-Yves Chibon |
627fb1 |
{% endif %}
|
|
Pierre-Yves Chibon |
627fb1 |
|
|
Pierre-Yves Chibon |
11eec1 |
|
|
Pierre-Yves Chibon |
11eec1 |
|
|
Pierre-Yves Chibon |
20621e |
|
|
Pierre-Yves Chibon |
20621e |
|
|
Pierre-Yves Chibon |
7694ed |
<script nonce="{{ g.nonce }}" type="text/javascript"></script>
|
|
Pierre-Yves Chibon |
20621e |
var source = null;
|
|
Pierre-Yves Chibon |
daae60 |
var sse = true;
|
|
Pierre-Yves Chibon |
56feda |
{% if config['EVENTSOURCE_SOURCE'] and pull_request %}
|
|
Pierre-Yves Chibon |
20621e |
if (!!window.EventSource) {
|
|
Pierre-Yves Chibon |
20621e |
source = new EventSource('{{ config["EVENTSOURCE_SOURCE"]
|
|
Pierre-Yves Chibon |
20621e |
+ request.script_root + request.path }}');
|
|
Pierre-Yves Chibon |
223960 |
source.addEventListener('error', function(e) {
|
|
Pierre-Yves Chibon |
223960 |
sse = false;
|
|
Pierre-Yves Chibon |
223960 |
}, false);
|
|
Pierre-Yves Chibon |
20621e |
}
|
|
Pierre-Yves Chibon |
20621e |
|
|
Pierre-Yves Chibon |
20621e |
window.onbeforeunload = function() {
|
|
Pierre-Yves Chibon |
20621e |
source.close()
|
|
Pierre-Yves Chibon |
20621e |
};
|
|
Pierre-Yves Chibon |
20621e |
|
|
Pierre-Yves Chibon |
20621e |
source.addEventListener('message', function(e) {
|
|
Pierre-Yves Chibon |
20621e |
console.log(e.data);
|
|
Pierre-Yves Chibon |
20621e |
var data = $.parseJSON(e.data);
|
|
Pierre-Yves Chibon |
00b9a2 |
process_event(
|
|
Pierre-Yves Chibon |
00b9a2 |
data,
|
|
Pierre-Yves Chibon |
00b9a2 |
"{{ request.uid }}",
|
|
Pierre-Yves Chibon |
b130e5 |
"{{ g.fas_user.username if g.authenticated or '' }}");
|
|
Pierre-Yves Chibon |
62bb73 |
setup_edit_btns();
|
|
Pierre-Yves Chibon |
4350fb |
setup_reply_btns();
|
|
Pierre-Yves Chibon |
20621e |
}, false);
|
|
Pierre-Yves Chibon |
56feda |
{% else %}
|
|
Pierre-Yves Chibon |
56feda |
sse = false;
|
|
Pierre-Yves Chibon |
20621e |
{% endif %}
|
|
Pierre-Yves Chibon |
56feda |
|
|
Pierre-Yves Chibon |
20621e |
|
|
Lubomír Sedlář |
011b1b |
{% if repo.quick_replies %}
|
|
Neha Kandpal |
68fd3d |
<script src="{{ url_for('static', filename='quick_reply.js') }}?version={{ g.version}}" type="text/javascript"></script>
|
|
Lubomír Sedlář |
011b1b |
{% endif %}
|
|
Neha Kandpal |
68fd3d |
<script src="{{ url_for('static', filename='reactions.js') }}?version={{ g.version}}" type="text/javascript"></script>
|
|
Lubomír Sedlář |
011b1b |
|
|
Pierre-Yves Chibon |
006f93 |
{% endblock %}
|