From d895a8169745ffc096dd0693294f6a6c74bfcb26 Mon Sep 17 00:00:00 2001 From: Sebastian Henz <sebastian.henz@ufz.de> Date: Mon, 17 Feb 2020 18:03:01 +0100 Subject: [PATCH] update merge request template and readme --- .gitlab/merge_request_templates/merge_into_master.md | 4 ++-- DESCRIPTION | 2 +- README.md | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab/merge_request_templates/merge_into_master.md b/.gitlab/merge_request_templates/merge_into_master.md index c1ac6d7..021f1ed 100644 --- a/.gitlab/merge_request_templates/merge_into_master.md +++ b/.gitlab/merge_request_templates/merge_into_master.md @@ -19,7 +19,7 @@ Comment on any notes that come up during devtools::check(). ### checklist <!-- 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 (if necessary) + * [ ] update documentation including examples (if necessary) * [ ] update NEWS.md * [ ] update version in DESCRIPTION * [ ] update date in DESCRIPTION @@ -36,4 +36,4 @@ master branch do these steps after the branch has been successfully merged: - git tag - build binary and source package - gitlab release including the builds ---> \ No newline at end of file +--> diff --git a/DESCRIPTION b/DESCRIPTION index 6ca5088..4ae1542 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -2,7 +2,7 @@ Package: stressaddition Type: Package Title: Modeling Tri-Phasic Concentration-Response Relationships Version: 2.0.0 -Date: 2020-02-15 +Date: 2020-02-17 Authors@R: c(person("Sebastian", "Henz", role = c("aut", "cre"), diff --git a/README.md b/README.md index d52dcf3..6522297 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ This is the R implementation of the tri-phasic concentration-response model intr It allows modeling of ecotoxicological experiments where the response shows signs of a hormesis effect. ## Installation -Stressaddition is not on CRAN. You can install the newest version from GitLab using the devtools package: +Stressaddition is not on CRAN. You can install the most recent stable version from GitLab using the devtools package: ``` r # install.packages("devtools") devtools::install_gitlab("oekotox/stressaddition", host = "git.ufz.de") -- GitLab