Merge branch 'master' into releases

This commit is contained in:
RedocBot 2016-04-30 20:47:21 +00:00 committed by travis@localhost
commit 399ab4503e
3 changed files with 8 additions and 2 deletions

View File

@ -1,11 +1,17 @@
#!/bin/bash #!/bin/bash
set -e set -e
set -x set -x
# copy old releases
mkdir -p .ghpages-tmp && cd .ghpages-tmp mkdir -p .ghpages-tmp && cd .ghpages-tmp
# reset local changes before checkout
git reset --hard
git fetch origin gh-pages:gh-pages
git checkout gh-pages git checkout gh-pages
cp -R ../releases/* . cp -R ../releases/* .
git checkout master git checkout master
cd - cd -
# build
gulp build gulp build
cd demo cd demo
cp -R ../dist ./dist cp -R ../dist ./dist

View File

@ -90,7 +90,7 @@ function bundle(outputFile, minify, cb) {
builder builder
.buildStatic(path.join(paths.tmp, paths.sourceEntryPoint), .buildStatic(path.join(paths.tmp, paths.sourceEntryPoint),
outputFile, outputFile,
{ format:'umd', sourceMaps: true, mangle: false, lowResSourceMaps: true, minify: minify } { format:'umd', sourceMaps: true, lowResSourceMaps: true, minify: minify }
) )
.then(function() { .then(function() {
// wait some time to allow flush // wait some time to allow flush

View File

@ -1,7 +1,7 @@
{ {
"name": "redoc", "name": "redoc",
"description": "Swagger-generated API Reference Documentation", "description": "Swagger-generated API Reference Documentation",
"version": "0.7.15", "version": "0.8.0",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "git://github.com/Rebilly/ReDoc" "url": "git://github.com/Rebilly/ReDoc"