diff --git a/.gitlab/merge_request_templates/mr_template.md b/.gitlab/merge_request_templates/mr_template.md index 31f8ef37c2718265a875f51fcc5c7a4266308201..97d8e445f313c00a9a6bd1b22d8cf931e07cd52e 100644 --- a/.gitlab/merge_request_templates/mr_template.md +++ b/.gitlab/merge_request_templates/mr_template.md @@ -1,5 +1,5 @@ ## Description -Description de l'US +[[#{US_ID}](https://forge.maarch.org/issues/{US_ID})] - {US_TITLE} ## Correctif / évolution Décrire le changement effectué diff --git a/ci/create_mr.sh b/ci/create_mr.sh index 59c61997f0eed488cc7bf6f08e49fc883d2120f5..a5eb28db2f22fe5afc9dce2839ab71c6ac3cfc89 100644 --- a/ci/create_mr.sh +++ b/ci/create_mr.sh @@ -52,7 +52,9 @@ else SUBJECT=`cat issue_$US.json | jq -r '.issue.subject'` - BODY="{\"id\":\"$CI_PROJECT_ID\",\"source_branch\":\"$CI_COMMIT_REF_NAME\",\"target_branch\":\"$TARGET_BRANCH\",\"title\":\"Draft: [$US] $SUBJECT\",\"description\":\"$SUBJECT\n=> https://forge.maarch.org/issues/$US\",\"remove_source_branch\":\"true\",\"squash\":\"false\"}" + MR_DESCRIPTION=$(awk 'BEGIN{RS="\n";ORS="\\n"}1' .gitlab/merge_request_templates/mr_template.md | sed -e "s/{US_ID}/$US/g" | sed -e "s/{US_TITLE}/$SUBJECT/g") + + BODY="{\"id\":\"$CI_PROJECT_ID\",\"source_branch\":\"$CI_COMMIT_REF_NAME\",\"target_branch\":\"$TARGET_BRANCH\",\"title\":\"Draft: [$US] $SUBJECT\",\"description\":\"$MR_DESCRIPTION\",\"remove_source_branch\":\"true\",\"squash\":\"false\"}" echo $BODY