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

Merged Develop

develop into 10-count.features

Merged Gervaise Henry requested to merge develop into 10-count.features 6 years ago

Mar 22, 2019
- Merge branch '10-count.features' into 'develop' · 8f536aab
  Gervaise Henry authored 6 years ago
```
# Conflicts:
#   astrocyte_pkg.yml
```
  8f536aab
- Merge branch '14-ci' into 'develop' · b69acc56
  Gervaise Henry authored 6 years ago
```
Resolve "Develop CI"

See merge request !27
```
  b69acc56
- Fix simple test mkdir · b9ad5121
  Gervaise Henry authored 6 years ago
  
  b9ad5121
- Reduce simple test data size and specify chemistry version · 4969bdc2
  Gervaise Henry authored 6 years ago
  
  4969bdc2
- Fix simple CI test-data linking · e90f8334
  Gervaise Henry authored 6 years ago
  
  e90f8334
- Create simple CI · 82dafd86
  Gervaise Henry authored 6 years ago
  
  82dafd86
- Merge branch 'develop' into '14-ci' · 42a26a09
  Gervaise Henry authored 6 years ago
```
Develop

See merge request !26
```
  42a26a09
- 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
- Stop run stage of ci for tags · d0fdbc46
  Gervaise Henry authored 6 years ago
  
  d0fdbc46
Mar 11, 2019
- Fix mouse ref for ci · 02319298
  Gervaise Henry authored 6 years ago
  
  02319298
- Fix test data folder · 9a298b46
  Gervaise Henry authored 6 years ago
  
  9a298b46
- Drop run ci to 2 · cbb753a1
  Gervaise Henry authored 6 years ago
  
  cbb753a1
- Merge branch 'master' into '14-ci' · 3584f8ba
  Gervaise Henry authored 6 years ago
```
Master

See merge request !19
```
  3584f8ba
- Add astrocyte check · 110bab86
  Gervaise Henry authored 6 years ago
  
  110bab86
- Fix astrocyte yml · 4caad35a
  Gervaise Henry authored 6 years ago
  
  4caad35a
- Merge branch 'develop' into 'master' · 27127abe
  Gervaise Henry authored 6 years ago
```
Develop

See merge request !18
```
  27127abe
- Merge branch '13-congig.params' into 'develop' · d429a220
  Gervaise Henry authored 6 years ago
```
Resolve "Add params from biohpc.config into main.nf"

Closes #13

See merge request !17
```
  d429a220
- Fix param erro · f236a41e
  Gervaise Henry authored 6 years ago
  
  f236a41e
- Put config params into main.nf for astrocyte · eae028c1
  Gervaise Henry authored 6 years ago
  
  eae028c1
- Copy memory requirement to main.nf for astrocyte · 745f08e0
  Gervaise Henry authored 6 years ago
  
  745f08e0
Mar 10, 2019
- Merge branch 'develop' into 'master' · 6ef47c9a
  Gervaise Henry authored 6 years ago
```
Develop

See merge request !16
```
  6ef47c9a
- Merge branch '3-instructions' into 'develop' · 1360363e
  Gervaise Henry authored 6 years ago
```
Resolve "Make instructions"

Closes #3

See merge request !15
```
  1360363e
- Merge branch '12-full.path.genomeLocation' into 'develop' · 4a6e9492
  Gervaise Henry authored 6 years ago
```
Resolve "Make param.genomeLocation have full path"

Closes #12

See merge request !14
```
  4a6e9492
- Update README.md · a5c2d05d
  Gervaise Henry authored 6 years ago
  
  a5c2d05d
- Update README.md · d107254e
  Gervaise Henry authored 6 years ago
  
  d107254e
- Change concatenated genomeLocation to genomeLocationFull · dcec356b
  Gervaise Henry authored 6 years ago
  
  dcec356b
- Change params.genomeLocation to concatenate with params.genome · 73a49881
  Gervaise Henry authored 6 years ago
  
  73a49881
- Remove = from .gitlab-ci.yml · 51737889
  Gervaise Henry authored 6 years ago
  
  51737889
- Update astrocyte_pkg.yml to reflect kitVersion param change · f037c9a7
  Gervaise Henry authored 6 years ago
  
  f037c9a7
- Add/update CI with simple tests for kit v 2 and 3, ref v 1.2.0 and 3.0.0, cellranger v 2 and 3 · efbc8c59
  Gervaise Henry authored 6 years ago
  
  efbc8c59
- Update .gitignore with nextflow analysis folders in root · 8b8d2d1e
  Gervaise Henry authored 6 years ago
  
  8b8d2d1e
- Add nextflow.config to pipeline root folder · 76d6ec90
  Gervaise Henry authored 6 years ago
  
  76d6ec90
- Change kitVersion from numeric to string value · 9fc2b894
  Gervaise Henry authored 6 years ago
  
  9fc2b894

Develop

Merge request reports

Activity