From 21c9d7b56970bb27c3d8c34f654b860639e7aaca Mon Sep 17 00:00:00 2001 From: Sebastian Henz <sebastian.henz@ufz.de> Date: Fri, 21 Feb 2020 17:23:25 +0100 Subject: [PATCH] Update merge request template --- .gitlab/merge_request_templates/merge_into_master.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab/merge_request_templates/merge_into_master.md b/.gitlab/merge_request_templates/merge_into_master.md index 021f1ed..670d525 100644 --- a/.gitlab/merge_request_templates/merge_into_master.md +++ b/.gitlab/merge_request_templates/merge_into_master.md @@ -20,7 +20,7 @@ Comment on any notes that come up during devtools::check(). <!-- Please check `[x]` the applicable boxes. --> * [ ] This merge includes bug fixes or changes in the functionality of the package (whether they are user-visible or not). * [ ] update documentation including examples (if necessary) - * [ ] update NEWS.md + * [ ] update and polish NEWS.md * [ ] update version in DESCRIPTION * [ ] update date in DESCRIPTION * [ ] This merge introduces new features. @@ -35,5 +35,5 @@ If this merge introduces a new version (major, minor or patch) to the master branch do these steps after the branch has been successfully merged: - git tag - build binary and source package -- gitlab release including the builds +- gitlab release and upload the builds --> -- GitLab