diff --git a/.Rbuildignore b/.Rbuildignore index 354a430..ae8d3b7 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -4,3 +4,4 @@ ^\.Rproj\.user$ ^LICENSE\.md$ ^README\.Rmd$ +^.github$ diff --git a/DESCRIPTION b/DESCRIPTION index 0cdf77d..fcc88a6 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: ghqc.app Title: Create QC Checklists in Github Issues -Version: 0.1.4 +Version: 0.1.5 Authors@R: c( person("Jenna", "Johnson", email = "jenna@a2-ai.com", role = c("aut", "cre")), person("Anne", "Zheng", email = "anne@a2-ai.com", role = c("aut")), @@ -8,7 +8,7 @@ Authors@R: c( person("Devin", "Pastoor", email = "devin@a2-ai.com", role = c("aut")), person("Wes", "Cummings", email = "wes@a2-ai.com", role = c("aut"))) Description: A QC tool with 3 major functions: creation and management of QC log, creation and management of QC record, perform semi-automated QC tasks. -License: GPL (>= 3) +License: GPL (>= 3) + file LICENSE Encoding: UTF-8 Roxygen: list(markdown = TRUE) RoxygenNote: 7.3.2 diff --git a/NAMESPACE b/NAMESPACE index 381dcb7..02ccf0d 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -14,6 +14,7 @@ importFrom(fs,dir_ls) importFrom(fs,is_dir) importFrom(fs,is_file) importFrom(gert,git_ahead_behind) +importFrom(gert,git_fetch) importFrom(gert,git_status) importFrom(glue,glue) importFrom(jsTreeR,jstree) diff --git a/NEWS.md b/NEWS.md index 7b971e8..29ba988 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,5 +1,6 @@ +# ghqc.app 0.1.5 -# ghqc.app (beta version) +- Fixes bug in assign and resolve apps - error checking did not catch remote changes to the directory because checks did not git fetch first # ghqc.app 0.1.4 @@ -16,25 +17,16 @@ # ghqc.app 0.1.1 -# Minor bug fixes - - In the case when someone sets the standard gh environment variable GITHUB_API_URL, each app checks if this URL matches the actual set remote URL. The function that gets the GITHUB_API_URL did not explicitly return a value. - Small grammar fix in error message from apps in the case that the checklists directory isn't in the cloned info repo. - -# ghqc.app (development version) - # ghqc.app 0.0.0.9011 -## Minor improvements - - rename ghqc to ghqc.app and ghqc.launcher to ghqc # ghqc 0.0.0.9010 -## Minor improvements - - terminology changed to match GitHub terminology like "Issue" and "Milestone" - git commit terminology changed from "reference" and "comparator" to "previous" and "current", respectively diff --git a/R/app_01_assign_server.R b/R/app_01_assign_server.R index 78b5aae..eae7465 100644 --- a/R/app_01_assign_server.R +++ b/R/app_01_assign_server.R @@ -4,7 +4,7 @@ #' @importFrom log4r warn error info debug #' @importFrom shinyjs enable disable addClass removeClass delay #' @importFrom waiter Waiter spin_1 spin_2 waiter_hide -#' @importFrom gert git_ahead_behind git_status +#' @importFrom gert git_status #' @importFrom rprojroot find_rstudio_root_file NULL @@ -256,7 +256,7 @@ return "