Merge branch 'release/0.6.5'

statgen · Aug 18, 2020 · 85aab17 · 85aab17
2 parents 756b9dc + 206b898
commit 85aab17
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "localzoom",
-  "version": "0.6.4",
+  "version": "0.6.5",
   "license": "MIT",
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -14,7 +14,7 @@
     "bootstrap": "^4.4.1",
     "bootstrap-vue": "^2.0.0-rc.11",
     "gwas-credible-sets": "^0.1.0",
-    "locuszoom": "0.12.0",
+    "locuszoom": "https://github.com/statgen/locuszoom#98f7eae",
     "lodash": "^4.17.11",
     "tabix-reader": "^1.0.0",
     "tabulator-tables": "^4.1.4",

diff --git a/src/util/lz-helpers.js b/src/util/lz-helpers.js
@@ -201,7 +201,7 @@ function getBasicSources(study_sources = []) {
         ['ld', ['LDLZ2', { url: LD_SERVER_BASE_URL, params: { source: '1000G', population: 'ALL' } }]],
         ['gene', ['GeneLZ', { url: `${PORTAL_API_BASE_URL}annotation/genes/` }]],
         ['recomb', ['RecombLZ', { url: `${PORTAL_API_BASE_URL}annotation/recomb/results/` }]],
-        ['constraint', ['GeneConstraintLZ', { url: 'https://gnomad.broadinstitute.org/api' }]],
+        ['constraint', ['GeneConstraintLZ', { url: 'https://gnomad.broadinstitute.org/api/' }]],
     ];
 }
 

diff --git a/yarn.lock b/yarn.lock
@@ -5849,10 +5849,9 @@ locate-path@^5.0.0:
   dependencies:
     p-locate "^4.1.0"
 
-locuszoom@0.12.0:
+"locuszoom@https://github.com/statgen/locuszoom#98f7eae":
   version "0.12.0"
-  resolved "https://registry.yarnpkg.com/locuszoom/-/locuszoom-0.12.0.tgz#9e2efb255bcf2ab5f64306e95674142e8677b2b2"
-  integrity sha512-56CjgXEzNIBHHnOzULzjZ0KWQ0hO7oHotFKtL1c8ad1r1vYuM1o+P+W0J+bmuXdr5Fh28ph9oEhwSyEuMBZFFw==
+  resolved "https://github.com/statgen/locuszoom#98f7eae9d51ee81d0fe47ac7f7407a79e90837b0"
   dependencies:
     d3 "^5.16.0"