Develop (!26) · Merge requests · BICF / Astrocyte / cellranger_count

Merged Develop

develop into 14-ci

Merged Gervaise Henry requested to merge develop into 14-ci 6 years ago

Mar 22, 2019
- Fix module loads in main.nfto address #13 · e4f3197b
  Gervaise Henry authored 6 years ago
  
  e4f3197b
- Merge branch 'master' into 'develop' · 7106c0a3
  Gervaise Henry authored 6 years ago
```
# Conflicts:
#   astrocyte_pkg.yml
```
  7106c0a3
Mar 21, 2019
- Merge branch '15-astrocyte.documentation' into 'develop' · cd3e193e
  Gervaise Henry authored 6 years ago
```
Resolve "Add Astrocyte documentation"

Closes #15

See merge request !23
```
  cd3e193e
- Update astrocyte_pkg.yml · 7d39ed2b
  Gervaise Henry authored 6 years ago
  
  7d39ed2b
- Update index.md · ac813bfb
  Gervaise Henry authored 6 years ago
  
  ac813bfb
- Add example design file · 8db3e25c
  Gervaise Henry authored 6 years ago
  
  8db3e25c
- Minor change to .gitignore · af541f00
  Gervaise Henry authored 6 years ago
  
  af541f00
- Make astrocyte parameter a select on astrocyte form · 145f016c
  David Trudgian authored 6 years ago
  
  145f016c
- Fix astrocyte param for implicit boolean conversion · cf9d3be8
  David Trudgian authored 6 years ago
  
  cf9d3be8
- Add data folder and ignore contents · b9723a49
  Gervaise Henry authored 6 years ago
  
  b9723a49
- Add hostname and ulimit -a to all processes for diagnosis · c43d49d7
  Gervaise Henry authored 6 years ago
  
  c43d49d7
Mar 12, 2019
- Put astrocyte param back to string · c2785043
  Gervaise Henry authored 6 years ago
  
  c2785043
- Change astrocyte param to be select · 23af414c
  Gervaise Henry authored 6 years ago
  
  23af414c
- Set queues instead of memory in main.nf until Astrocyte update to use custom configs · b0677edf
  Gervaise Henry authored 6 years ago
  
  b0677edf
- Merge branch 'develop' into 'master' · 2ccd4175
  Gervaise Henry authored 6 years ago
```
Develop

See merge request !22
```
  2ccd4175
- Merge branch '14-ci' into 'develop' · 60f859d1
  Gervaise Henry authored 6 years ago
```
Resolve "Develop CI"

Closes #14

See merge request !21
```
  60f859d1
- Add module loads to processes in main.nf until custom configs fixed in astrocyte · b965b5d4
  Gervaise Henry authored 6 years ago
  
  b965b5d4
- Merge branch 'master' into 'develop' · 1e4dc79c
  Gervaise Henry authored 6 years ago
```
Master

See merge request !20
```
  1e4dc79c

Develop

Merge request reports

Activity