Show More
@@ -56,7 +56,7 b" HOOKS_HOST = '127.0.0.1'" | |||||
56 |
|
56 | |||
57 |
|
57 | |||
58 | MERGE_MESSAGE_TMPL = ( |
|
58 | MERGE_MESSAGE_TMPL = ( | |
59 |
u'Merge pull request |
|
59 | u'Merge pull request !{pr_id} from {source_repo} {source_ref_name}\n\n ' | |
60 | u'{pr_title}') |
|
60 | u'{pr_title}') | |
61 | MERGE_DRY_RUN_MESSAGE = 'dry_run_merge_message_from_rhodecode' |
|
61 | MERGE_DRY_RUN_MESSAGE = 'dry_run_merge_message_from_rhodecode' | |
62 | MERGE_DRY_RUN_USER = 'Dry-Run User' |
|
62 | MERGE_DRY_RUN_USER = 'Dry-Run User' |
@@ -52,11 +52,11 b'' | |||||
52 | { data: {"_": "target_repo", |
|
52 | { data: {"_": "target_repo", | |
53 | "sort": "target_repo"}, title: "${_('Target Repo')}", className: "td-targetrepo", orderable: false}, |
|
53 | "sort": "target_repo"}, title: "${_('Target Repo')}", className: "td-targetrepo", orderable: false}, | |
54 | { data: {"_": "name", |
|
54 | { data: {"_": "name", | |
55 |
"sort": "name_raw"}, title: "${_(' |
|
55 | "sort": "name_raw"}, title: "${_('Id')}", className: "td-componentname", "type": "num" }, | |
|
56 | { data: {"_": "title", | |||
|
57 | "sort": "title"}, title: "${_('Title')}", className: "td-description" }, | |||
56 | { data: {"_": "author", |
|
58 | { data: {"_": "author", | |
57 | "sort": "author_raw"}, title: "${_('Author')}", className: "td-user", orderable: false }, |
|
59 | "sort": "author_raw"}, title: "${_('Author')}", className: "td-user", orderable: false }, | |
58 | { data: {"_": "title", |
|
|||
59 | "sort": "title"}, title: "${_('Title')}", className: "td-description" }, |
|
|||
60 | { data: {"_": "comments", |
|
60 | { data: {"_": "comments", | |
61 | "sort": "comments_raw"}, title: "", className: "td-comments", orderable: false}, |
|
61 | "sort": "comments_raw"}, title: "", className: "td-comments", orderable: false}, | |
62 | { data: {"_": "updated_on", |
|
62 | { data: {"_": "updated_on", |
@@ -68,9 +68,9 b'' | |||||
68 | % if comment.pull_request: |
|
68 | % if comment.pull_request: | |
69 | <a href="${h.route_path('pullrequest_show',repo_name=comment.pull_request.target_repo.repo_name,pull_request_id=comment.pull_request.pull_request_id)}"> |
|
69 | <a href="${h.route_path('pullrequest_show',repo_name=comment.pull_request.target_repo.repo_name,pull_request_id=comment.pull_request.pull_request_id)}"> | |
70 | % if comment.status_change: |
|
70 | % if comment.status_change: | |
71 |
${_('pull request |
|
71 | ${_('pull request !{}').format(comment.pull_request.pull_request_id)}: | |
72 | % else: |
|
72 | % else: | |
73 |
${_('pull request |
|
73 | ${_('pull request !{}').format(comment.pull_request.pull_request_id)} | |
74 | % endif |
|
74 | % endif | |
75 | </a> |
|
75 | </a> | |
76 | % else: |
|
76 | % else: |
@@ -371,9 +371,9 b'' | |||||
371 | <%def name="pullrequest_name(pull_request_id, target_repo_name, short=False)"> |
|
371 | <%def name="pullrequest_name(pull_request_id, target_repo_name, short=False)"> | |
372 | <a href="${h.route_path('pullrequest_show',repo_name=target_repo_name,pull_request_id=pull_request_id)}"> |
|
372 | <a href="${h.route_path('pullrequest_show',repo_name=target_repo_name,pull_request_id=pull_request_id)}"> | |
373 | % if short: |
|
373 | % if short: | |
374 |
|
|
374 | !${pull_request_id} | |
375 | % else: |
|
375 | % else: | |
376 |
${_('Pull request |
|
376 | ${_('Pull request !{}').format(pull_request_id)} | |
377 | % endif |
|
377 | % endif | |
378 | </a> |
|
378 | </a> | |
379 | </%def> |
|
379 | </%def> |
@@ -3,7 +3,7 b'' | |||||
3 | <%namespace name="dt" file="/data_table/_dt_elements.mako"/> |
|
3 | <%namespace name="dt" file="/data_table/_dt_elements.mako"/> | |
4 |
|
4 | |||
5 | <%def name="title()"> |
|
5 | <%def name="title()"> | |
6 |
${_(' |
|
6 | ${_('{} Pull Request !{}').format(c.repo_name, c.pull_request.pull_request_id)} | |
7 | %if c.rhodecode_name: |
|
7 | %if c.rhodecode_name: | |
8 | · ${h.branding(c.rhodecode_name)} |
|
8 | · ${h.branding(c.rhodecode_name)} | |
9 | %endif |
|
9 | %endif | |
@@ -45,7 +45,7 b'' | |||||
45 | <div class="summary-details block-left"> |
|
45 | <div class="summary-details block-left"> | |
46 | <% summary = lambda n:{False:'summary-short'}.get(n) %> |
|
46 | <% summary = lambda n:{False:'summary-short'}.get(n) %> | |
47 | <div class="pr-details-title"> |
|
47 | <div class="pr-details-title"> | |
48 |
<a href="${h.route_path('pull_requests_global', pull_request_id=c.pull_request.pull_request_id)}">${_('Pull request |
|
48 | <a href="${h.route_path('pull_requests_global', pull_request_id=c.pull_request.pull_request_id)}">${_('Pull request !{}').format(c.pull_request.pull_request_id)}</a> ${_('From')} ${h.format_date(c.pull_request.created_on)} | |
49 | %if c.allowed_to_update: |
|
49 | %if c.allowed_to_update: | |
50 | <div id="delete_pullrequest" class="pull-right action_button ${'' if c.allowed_to_delete else 'disabled' }" style="clear:inherit;padding: 0"> |
|
50 | <div id="delete_pullrequest" class="pull-right action_button ${'' if c.allowed_to_delete else 'disabled' }" style="clear:inherit;padding: 0"> | |
51 | % if c.allowed_to_delete: |
|
51 | % if c.allowed_to_delete: |
@@ -78,11 +78,11 b'' | |||||
78 | { data: {"_": "status", |
|
78 | { data: {"_": "status", | |
79 | "sort": "status"}, title: "", className: "td-status", orderable: false}, |
|
79 | "sort": "status"}, title: "", className: "td-status", orderable: false}, | |
80 | { data: {"_": "name", |
|
80 | { data: {"_": "name", | |
81 |
"sort": "name_raw"}, title: "${_(' |
|
81 | "sort": "name_raw"}, title: "${_('Id')}", className: "td-componentname", "type": "num" }, | |
|
82 | { data: {"_": "title", | |||
|
83 | "sort": "title"}, title: "${_('Title')}", className: "td-description" }, | |||
82 | { data: {"_": "author", |
|
84 | { data: {"_": "author", | |
83 | "sort": "author_raw"}, title: "${_('Author')}", className: "td-user", orderable: false }, |
|
85 | "sort": "author_raw"}, title: "${_('Author')}", className: "td-user", orderable: false }, | |
84 | { data: {"_": "title", |
|
|||
85 | "sort": "title"}, title: "${_('Title')}", className: "td-description" }, |
|
|||
86 | { data: {"_": "comments", |
|
86 | { data: {"_": "comments", | |
87 | "sort": "comments_raw"}, title: "", className: "td-comments", orderable: false}, |
|
87 | "sort": "comments_raw"}, title: "", className: "td-comments", orderable: false}, | |
88 | { data: {"_": "updated_on", |
|
88 | { data: {"_": "updated_on", |
@@ -296,7 +296,7 b' class TestPullRequestModel(object):' | |||||
296 | Session().commit() |
|
296 | Session().commit() | |
297 |
|
297 | |||
298 | message = ( |
|
298 | message = ( | |
299 |
u'Merge pull request |
|
299 | u'Merge pull request !{pr_id} from {source_repo} {source_ref_name}' | |
300 | u'\n\n {pr_title}'.format( |
|
300 | u'\n\n {pr_title}'.format( | |
301 | pr_id=pull_request.pull_request_id, |
|
301 | pr_id=pull_request.pull_request_id, | |
302 | source_repo=safe_unicode( |
|
302 | source_repo=safe_unicode( | |
@@ -340,7 +340,7 b' class TestPullRequestModel(object):' | |||||
340 | assert pull_request.pull_request_state == PullRequest.STATE_CREATED |
|
340 | assert pull_request.pull_request_state == PullRequest.STATE_CREATED | |
341 |
|
341 | |||
342 | message = ( |
|
342 | message = ( | |
343 |
u'Merge pull request |
|
343 | u'Merge pull request !{pr_id} from {source_repo} {source_ref_name}' | |
344 | u'\n\n {pr_title}'.format( |
|
344 | u'\n\n {pr_title}'.format( | |
345 | pr_id=pull_request.pull_request_id, |
|
345 | pr_id=pull_request.pull_request_id, | |
346 | source_repo=safe_unicode( |
|
346 | source_repo=safe_unicode( | |
@@ -379,7 +379,7 b' class TestPullRequestModel(object):' | |||||
379 | Session().commit() |
|
379 | Session().commit() | |
380 |
|
380 | |||
381 | message = ( |
|
381 | message = ( | |
382 |
u'Merge pull request |
|
382 | u'Merge pull request !{pr_id} from {source_repo} {source_ref_name}' | |
383 | u'\n\n {pr_title}'.format( |
|
383 | u'\n\n {pr_title}'.format( | |
384 | pr_id=pull_request.pull_request_id, |
|
384 | pr_id=pull_request.pull_request_id, | |
385 | source_repo=safe_unicode( |
|
385 | source_repo=safe_unicode( |
General Comments 0
You need to be logged in to leave comments.
Login now