self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2024-11-27 08:21:03 +02:00
Code Issues Releases Activity

Merge branch 'dev' into release-2.6

Browse Source
This commit is contained in:
Laurent Cozic 2021-11-03 12:55:28 +00:00
commit 8c6d78e01c
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/lib/package-lock.json generated
View File

@ -6,7 +6,7 @@
"packages": {
"": {
"name": "@joplin/lib",
"version": "2.6.0",
"version": "2.6.2",
"license": "ISC",
"dependencies": {
"async-mutex": "^0.1.3",

2
packages/renderer/package-lock.json generated
View File

@ -6,7 +6,7 @@
"packages": {
"": {
"name": "@joplin/renderer",
"version": "2.6.0",
"version": "2.6.2",
"license": "MIT",
"dependencies": {
"font-awesome-filetypes": "^2.1.0",

9
packages/server/src/utils/testing/testUtils.ts
View File

@ -23,6 +23,7 @@ import MustacheService from '../../services/MustacheService';
import uuidgen from '../uuidgen';
import { createCsrfToken } from '../csrf';
import { cookieSet } from '../cookies';
import { parseEnv } from '../../env';
// Takes into account the fact that this file will be inside the /dist directory
// when it runs.
@ -73,20 +74,20 @@ export async function beforeAllDb(unitName: string, createDbOptions: CreateDbOpt
//
// sudo docker compose -f docker-compose.db-dev.yml up
// await initConfig(Env.Dev, {
// await initConfig(Env.Dev, parseEnv({
// DB_CLIENT: 'pg',
// POSTGRES_DATABASE: unitName,
// POSTGRES_USER: 'joplin',
// POSTGRES_PASSWORD: 'joplin',
// SUPPORT_EMAIL: 'testing@localhost',
// }, {
// }), {
// tempDir: tempDir,
// });
await initConfig(Env.Dev, {
await initConfig(Env.Dev, parseEnv({
SQLITE_DATABASE: createdDbPath_,
SUPPORT_EMAIL: 'testing@localhost',
} as any, {
}), {
tempDir: tempDir,
});