Merge branch 'develop' into 'master'

Develop

See merge request !13

.gitlab-ci.yml

@@ -6,9 +6,28 @@ before_script:
 
 stages:
   - astrocyte
+  - simple
 
 astrocyte_check:
   stage: astrocyte
   script:
   - astrocyte_cli check ../tcga_shiny
+  artifacts:
+    expire_in: 2 days
+  retry:
+    max: 2
+    when:
+      - always
 
+simple:
+  stage: simple
+  except:
+    - tags
+  script:
+    - nextflow run workflow/main.nf
+  artifacts:
+    expire_in: 2 days
+  retry:
+    max: 2
+    when:
+      - always
\ No newline at end of file

CHANGELOG

+# v1.0.0 (in development)
+**User Facing**
+* Working version
+
+**Background**
+
+*Known Bugs*
\ No newline at end of file

README.md

+|*master*|*develop*|
+|:-:|:-:|
+|[![Build Status](https://git.biohpc.swmed.edu/BICF/Astrocyte/tcga_shiny/badges/master/build.svg)](https://git.biohpc.swmed.edu/BICF/Astrocyte/tcga_shiny/commits/master)|[![Build Status](https://git.biohpc.swmed.edu/BICF/Astrocyte/tcga_shiny/badges/develop/build.svg)](https://git.biohpc.swmed.edu/BICF/Astrocyte/tcga_shiny/commits/develop)|
+
 Author: Spencer Barnes <Spencer.Barnes@UTSouthwestern.edu>   
 Date: January 25, 2019    
 Description: Shiny app for analyzing TCGA data for frequently asked requests through the Help-Desk.    

astrocyte_pkg.yml

@@ -9,7 +9,7 @@
 # A unique identifier for the workflow package, text/underscores only
 name: 'tcga_shiny'
 # Who wrote this?
-author: 'Spencer Barnes, Gervaise Henry and Venkat Malladi'
+author: 'Spencer Barnes, Gervaise H. Henry, Jeremy Mathews and Venkat Malladi'
 # A contact email address for questions
 email: 'bicf@utsouthwestern.edu'
 # A more informative title for the workflow package