Merge branch 'develop'

This commit is contained in:
Alice Gaudon 2020-07-15 15:16:40 +02:00
commit dd30c02682
3 changed files with 3 additions and 5 deletions

View File

@ -18,7 +18,6 @@ export default Object.assign(require("wms-core/config/default").default, {
magic_link: { magic_link: {
validity_period: 20 validity_period: 20
}, },
gitlab_webhook_token: 'secret',
newlyGeneratedSlugSize: 3, newlyGeneratedSlugSize: 3,
default_file_ttl: 30, // 30 seconds default_file_ttl: 30, // 30 seconds
max_upload_size: 1, // MB max_upload_size: 1, // MB

View File

@ -12,7 +12,6 @@ export default Object.assign(require("wms-core/config/production").default, {
magic_link: { magic_link: {
validity_period: 900 validity_period: 900
}, },
gitlab_webhook_token: 'CHANGEME',
newlyGeneratedSlugSize: 5, newlyGeneratedSlugSize: 5,
default_file_ttl: 30 * 24 * 3600, // 30 days default_file_ttl: 30 * 24 * 3600, // 30 days
max_upload_size: 8192, // MB max_upload_size: 8192, // MB

View File

@ -9837,9 +9837,9 @@ widest-line@^3.1.0:
string-width "^4.0.0" string-width "^4.0.0"
wms-core@^0: wms-core@^0:
version "0.15.5" version "0.16.0"
resolved "https://registry.toot.party/wms-core/-/wms-core-0.15.5.tgz#40784c8dae3e5b2d1a71f78410233557dc885a2b" resolved "https://registry.toot.party/wms-core/-/wms-core-0.16.0.tgz#2c73b5c5af35ae2a53dd4b2eac12ec0961633960"
integrity sha512-c/zrvs7otF+a2/KFBWQN3bJi0Gtd/FlX31CdKlrUl98bdfLwtmGfGfKhP6DNROvzznw9sUWOFEqPrG08KhqgGA== integrity sha512-NdJ1LrTyfJ41u/npOVfvmwkDEUGFzqczPwO6/R+KaAXE1GQlSRVLbNm/XoyZVF0ceDCwjp58a+zS3KumUI5faA==
dependencies: dependencies:
argon2 "^0.26.2" argon2 "^0.26.2"
compression "^1.7.4" compression "^1.7.4"