Skip to content

Commit

Permalink
Merge branch 'master' into kokoroDatastore
Browse files Browse the repository at this point in the history
  • Loading branch information
fhinkel authored Jun 6, 2018
2 parents e2325fe + fd0bf0e commit f1e97a4
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 2 deletions.
2 changes: 1 addition & 1 deletion appengine/cloudtasks/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Before you can run or deploy the sample, you need to do the following:

1. Refer to the [appengine/README.md][readme] file for instructions on
running and deploying.
1. Enable the Cloud Tasks API in the [Google Cloud Console](https://cloud.google.com/apis/library/cloudtasks.googleapis.com).
1. Enable the Cloud Tasks API in the [Google Cloud Console](https://console.cloud.google.com/apis/api/tasks.googleapis.com).
1. Install dependencies:

With `npm`:
Expand Down
7 changes: 7 additions & 0 deletions appengine/static-files/app.standard.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,11 @@

# [START app_yaml]
runtime: nodejs8

handlers:
- url: /static
static_dir: public

- url: /.*
script: auto
# [END app_yaml]
2 changes: 1 addition & 1 deletion appengine/static-files/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
},
"dependencies": {
"express": "4.16.2",
"pug": "2.0.0"
"pug": "2.0.3"
},
"devDependencies": {
"@google-cloud/nodejs-repo-tools": "2.2.1"
Expand Down

0 comments on commit f1e97a4

Please sign in to comment.