Merge branch 'master' into remove_colors

This commit is contained in:
Eric Schultz 2019-02-28 11:00:07 -06:00 committed by GitHub
commit 666ee76fc9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions

View file

@ -15,7 +15,7 @@
"export-i18n": "bundle exec rake settings:combine_translations", "export-i18n": "bundle exec rake settings:combine_translations",
"generate-openapi": "rake oapi:gen", "generate-openapi": "rake oapi:gen",
"get-codegen-cli": "script/download_codegen_cli.sh", "get-codegen-cli": "script/download_codegen_cli.sh",
"generate-api-js": "rm -rf javascripts/api && npm run get-codegen-cli && npm run generate-openapi && java -jar .bin/swagger-codegen-cli.jar generate -l 'typescript-jquery' -i tmp/openapi.json -o javascripts/api -t lib/swagger-typescript-jquery" "generate-api-js": "rm -rf javascripts/api && npm run get-codegen-cli && npm run generate-openapi && java -jar .bin/swagger-codegen-cli.jar generate -l 'typescript-jquery' -i tmp/openapi.json -o javascripts/api --config 'swagger.json' -t lib/swagger-typescript-jquery"
}, },
"devDependencies": { "devDependencies": {
"@types/enzyme": "^3.1.9", "@types/enzyme": "^3.1.9",

3
swagger.json Normal file
View file

@ -0,0 +1,3 @@
{
"modelPropertyNaming": "original"
}