ulysia/szurubooru
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

typo...

Browse source
This commit is contained in:
nothink 2018-08-01 13:50:12 +09:00
parent f48d1a1022
commit 53b112d407
2 changed files with 0 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
.travis.yml
View file

@ -9,7 +9,6 @@ services:
matrix: matrix:
include: include:
- language: python - language: python
# Backend test for on-premise / python 3.6
python: python:
- "3.6" - "3.6"
allow_failures: allow_failures:
@ -42,7 +41,6 @@ matrix:
- py.test - py.test
- language: python - language: python
# Backend test for on-premise / python 3.7-dev
python: python:
- "3.7-dev" - "3.7-dev"
allow_failures: allow_failures:
@ -75,7 +73,6 @@ matrix:
- py.test - py.test
- language: node_js - language: node_js
# Frontend test ugins npm / nodejs 6
node_js: node_js:
name: "Frontend test ugins npm / nodejs 6" name: "Frontend test ugins npm / nodejs 6"
- "6" - "6"
@ -86,7 +83,6 @@ matrix:
- node build.js - node build.js
- language: node_js - language: node_js
# Frontend test ugins npm / nodejs 7
node_js: node_js:
name: "Frontend test ugins npm / nodejs 7" name: "Frontend test ugins npm / nodejs 7"
- "7" - "7"
@ -97,7 +93,6 @@ matrix:
- node build.js - node build.js
- language: node_js - language: node_js
# Frontend test ugins npm / nodejs 8
node_js: node_js:
name: "Frontend test ugins npm / nodejs 8" name: "Frontend test ugins npm / nodejs 8"
- "8" - "8"
@ -108,7 +103,6 @@ matrix:
- node build.js - node build.js
- language: node_js - language: node_js
# Frontend test ugins npm / nodejs 9
node_js: node_js:
name: "Frontend test ugins npm / nodejs 9" name: "Frontend test ugins npm / nodejs 9"
- "9" - "9"
@ -119,7 +113,6 @@ matrix:
- node build.js - node build.js
- language: node_js - language: node_js
# Frontend test ugins yarn / nodejs 9
node_js: node_js:
- "9" - "9"
name: "Frontend test ugins yarn / nodejs 9" name: "Frontend test ugins yarn / nodejs 9"

1
server/szurubooru/config.py
View file

@ -53,7 +53,6 @@ def read_config() -> Dict:
ret = merge(ret, yaml.load(handle.read())) ret = merge(ret, yaml.load(handle.read()))
if os.path.exists('/.dockerenv'): if os.path.exists('/.dockerenv'):
ret = merge(ret, docker_config()) ret = merge(ret, docker_config())
return ret return ret