Public

Project privacy set to public. By default, its content is available to everyone (authenticated or not). Please note that more restrictive permissions might exist on some items.

stable

Clone or download

Read-only

Display state of merge request as a badge in xref

Download Browse

Merge or close a GitLab merge request that is referencing an artifact. => In the cross references of the artifact, the state is displayed as a label for the given merge request. Took the opportunity to: - update the french translation of merge request to "Demande de fusion" (like it is done in GitLab) - store the description of the merge request in the database for later use (to benefit from the forgeupgrade) Part of story #17182: reference tuleap artifacts in gitlab merge requests Change-Id: I882cac3eec231d91b1249d68fcb179bb2e1826dc

+198 −53
Nicolas Terray (nterray) 2021-01-20 07:00
Nicolas Terray (nterray) 2021-01-20 11:53
34ece0e85d1d393777732340fc1c7e94b4fa8e52
a46766603c6308919ae784bd1e6abef593262ff9
git #tuleap/stable/34ece0e85d1d393777732340fc1c7e94b4fa8e52

Modified Files

Side by side diff
Inline diff
Name
M plugins/gitlab/db/install.sql +2 −0 Go to diff View file
A plugins/gitlab/db/mysql/2021/202101191800_add_description_and_state_in_gitlab_merge_request_info_table.php +52 −0 Go to diff View file
M plugins/gitlab/include/Reference/GitlabCrossReferenceOrganizer.php +38 −2 Go to diff View file
M plugins/gitlab/include/Reference/MergeRequest/GitlabMergeRequest.php +15 −2 Go to diff View file
M plugins/gitlab/include/Reference/MergeRequest/GitlabMergeRequestReferenceRetriever.php +2 −1 Go to diff View file
M plugins/gitlab/include/Repository/Webhook/PostMergeRequest/MergeRequestTuleapReferenceDao.php +11 −5 Go to diff View file
M plugins/gitlab/include/Repository/Webhook/PostMergeRequest/PostMergeRequestWebhookActionProcessor.php +5 −3 Go to diff View file
M plugins/gitlab/include/Repository/Webhook/PostMergeRequest/PostMergeRequestWebhookData.php +18 −8 Go to diff View file
M plugins/gitlab/include/Repository/Webhook/PostMergeRequest/PostMergeRequestWebhookDataBuilder.php +26 −17 Go to diff View file
M plugins/gitlab/site-content/fr_FR/LC_MESSAGES/tuleap-gitlab.po +11 −2 Go to diff View file
M plugins/gitlab/tests/unit/Reference/GitlabCrossReferenceOrganizerTest.php +4 −2 Go to diff View file
M plugins/gitlab/tests/unit/Repository/Webhook/PostMergeRequest/PostMergeRequestWebhookActionProcessorTest.php +4 −2 Go to diff View file
M plugins/gitlab/tests/unit/Repository/Webhook/PostMergeRequest/PostMergeRequestWebhookDataBuilderTest.php +8 −3 Go to diff View file
M plugins/gitlab/tests/unit/Repository/Webhook/WebhookActionsTest.php +2 −1 Go to diff View file
M plugins/gitlab/tests/unit/Repository/Webhook/WebhookDataExtractorTest.php +0 −5 Go to diff View file