Skip to content

Commit

Permalink
Merge pull request #73 from bcgsc/master
Browse files Browse the repository at this point in the history
Merge master back to develop
  • Loading branch information
sshugsc committed Jul 31, 2024
2 parents 9a989ef + 6196e05 commit de1a258
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@bcgsc-pori/graphkb-api",
"main": "server.js",
"version": "3.14.6",
"version": "3.15.0",
"private": true,
"repository": {
"type": "git",
Expand Down
2 changes: 1 addition & 1 deletion test/db_integration/service_routes.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const { createEmptyDb, tearDownDb } = require('./util');
const request = async (opt) => requestPromise({ json: true, resolveWithFullResponse: true, ...opt });

const REALLY_LONG_TIME = 10000000000;
const TEST_TIMEOUT_MS = 1000000;
const TEST_TIMEOUT_MS = 2000000;
jest.setTimeout(TEST_TIMEOUT_MS);

const describeWithAuth = process.env.GKB_DBS_PASS
Expand Down

0 comments on commit de1a258

Please sign in to comment.