diff --git a/requirements.txt b/requirements.txt index dd17e88a..042db87c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -91,6 +91,10 @@ formencode==2.0.1 six==1.16.0 gunicorn==21.2.0 packaging==23.1 +gevent==23.7.0 + greenlet==2.0.2 + zope.event==5.0.0 + zope.interface==6.0.0 infrae.cache==1.0.1 beaker==1.12.1 repoze.lru==0.7 diff --git a/rhodecode/apps/my_account/views/my_account.py b/rhodecode/apps/my_account/views/my_account.py index bf6c195f..94865969 100644 --- a/rhodecode/apps/my_account/views/my_account.py +++ b/rhodecode/apps/my_account/views/my_account.py @@ -706,6 +706,7 @@ class MyAccountView(BaseAppView, DataGridAppView): 'my_status': _render('pullrequest_status', my_review_status), 'title': _render('pullrequest_title', pr.title, pr.description), + 'pr_flow': _render('pullrequest_commit_flow', pr), 'description': h.escape(pr.description), 'updated_on': _render('pullrequest_updated_on', h.datetime_to_time(pr.updated_on), diff --git a/rhodecode/apps/repository/views/repo_pull_requests.py b/rhodecode/apps/repository/views/repo_pull_requests.py index 3734c2e8..4b7ef313 100644 --- a/rhodecode/apps/repository/views/repo_pull_requests.py +++ b/rhodecode/apps/repository/views/repo_pull_requests.py @@ -124,6 +124,7 @@ class RepoPullRequestsView(RepoAppView, DataGridAppView): 'my_status': _render('pullrequest_status', my_review_status), 'title': _render('pullrequest_title', pr.title, pr.description), + 'pr_flow': _render('pullrequest_commit_flow', pr), 'description': h.escape(pr.description), 'updated_on': _render('pullrequest_updated_on', h.datetime_to_time(pr.updated_on), diff --git a/rhodecode/templates/admin/my_account/my_account_pullrequests.mako b/rhodecode/templates/admin/my_account/my_account_pullrequests.mako index 840af44b..3bb84f1e 100644 --- a/rhodecode/templates/admin/my_account/my_account_pullrequests.mako +++ b/rhodecode/templates/admin/my_account/my_account_pullrequests.mako @@ -93,6 +93,12 @@ "sort": "title" }, title: "${_('Title')}", className: "td-description" }, + { + data: { + "_": "pr_flow", + "sort": "pr_flow" + }, title: "${_('Flow')}", className: "td-componentname" + }, { data: { "_": "author", diff --git a/rhodecode/templates/data_table/_dt_elements.mako b/rhodecode/templates/data_table/_dt_elements.mako index 3a07eb72..4b4dc244 100644 --- a/rhodecode/templates/data_table/_dt_elements.mako +++ b/rhodecode/templates/data_table/_dt_elements.mako @@ -374,6 +374,25 @@ ${h.style_metatag(tag_type, tag)|n,trim} ${title} %def> +<%def name="pullrequest_commit_flow(pull_request)"> +
${pull_request.source_ref_parts.name}
+ →
+ ## Target
+ ${pull_request.target_ref_parts.name}
+