Commit5d6fc72

committed

chore: merge pull

2 parents16b6876 +75bbb36 commit5d6fc72Copy full SHA for 5d6fc72

File tree

+417

-184

lines changed

+417

-184

lines changed

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,10 @@ otp_release:`
`5`	`5`	`-21.0`
`6`	`6`	`addons:`
`7`	`7`	`postgresql:'9.6'`
	`8`	`+apt:`
	`9`	`+packages:`
	`10`	`+# Ubuntu 16+ does not install this dependency by default, so we need to install it ourselves`
	`11`	`+ -libgconf-2-4`
`8`	`12`
`9`	`13`	`before_install:`
`10`	`14`	`-sudo chown -R travis ./travis/install_node.sh`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -161,8 +161,9 @@ export const openUpdateEditor = data =>`
`161`	`161`	`})`
`162`	`162`
`163`	`163`	`exportconstopenReplyEditor=data=>{`
`164`		`-initDraftTimmer()`
	`164`	`+if(!store.isLogin)returnstore.authWarning()`
`165`	`165`
	`166`	`+initDraftTimmer()`
`166`	`167`	`store.markState({`
`167`	`168`	`showReplyBox:true,`
`168`	`169`	`showReplyEditor:true,`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name":"coderplanets_web",`
`3`		`-"version":"0.4.2",`
	`3`	`+"version":"0.5.1",`
`4`	`4`	`"license":"Apache License 2.0",`
`5`	`5`	`"scripts": {`
`6`	`6`	`"dev":"cross-env NODE_ENV=dev node server.js",`
`@@ -145,7 +145,7 @@`
`145`	`145`	`"commitizen":"3.1.2",`
`146`	`146`	`"coveralls":"3.0.3",`
`147`	`147`	`"cross-env":"^5.0.5",`
`148`		`-"cypress":"^3.0.2",`
	`148`	`+"cypress":"3.4.1",`
`149`	`149`	`"cz-conventional-changelog":"^3.0.0",`
`150`	`150`	`"dotenv":"6.2.0",`
`151`	`151`	`"dotenv-webpack":"1.6.0",`
`@@ -163,7 +163,7 @@`
`163`	`163`	`"react-test-renderer":"16.8.1",`
`164`	`164`	`"regenerator-runtime":"^0.13.1",`
`165`	`165`	`"shelljs":"0.8.2",`
`166`		`-"standard-version":"^4.4.0",`
	`166`	`+"standard-version":"^7.0.0",`
`167`	`167`	`"start-server-and-test":"^1.7.13"`
`168`	`168`	`}`
`169`	`169`	`}`

Comments

(0)