entrouvert
/
gitea-redmine
17
0
Fork 0
Code Issues Pull Requests Releases Activity

Use sender instead of pull request merged_by for redmine merged comment

This commit is contained in:
Agate 2022-11-21 14:41:42 +01:00 committed by Gitea
parent f36c7938c0
commit e7d23a526a
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gitea_redmine.py
View File

@ -227,7 +227,7 @@ handle_pull_request_draft = make_handler(
handle_pull_request_merged = make_handler(
set_status(REDMINE_STATUSES['Résolu']),
add_note(
'{pull_request_merged_by_full_name} ({pull_request_merged_by_username}) a mergé une pull request sur Gitea concernant cette demande :\n\n* URL : {pull_request_url}\n* Titre : {pull_request_title}\n* Modifications : {pull_request_url}/files'
'{sender_full_name} ({sender_username}) a mergé une pull request sur Gitea concernant cette demande :\n\n* URL : {pull_request_url}\n* Titre : {pull_request_title}\n* Modifications : {pull_request_url}/files'
),
save(),
)

14
test_app.py
View File

@ -308,17 +308,17 @@ def test_handle_pull_request_merged(mocker):
"id": 7,
"url": "https://gitea.entrouvert.org/entrouvert/gitea-redmine/pulls/2",
"number": 2,
"merged_by": {
"id": 7,
"login": "testuser",
"full_name": "Test User",
"email": "test_user@noreply.gitea.entrouvert.org",
"username": "testuser",
},
"title": "Foo",
"body": "See #70893",
"merged": True,
},
"sender": {
"id": 7,
"login": "testuser",
"full_name": "Test User",
"email": "test_user@noreply.gitea.entrouvert.org",
"username": "testuser",
},
}
issue = mocker.Mock()