Merge pull request #50 from angular/master

Update upstream

Author: GulajavaMinistudio

Gruntfile.js

@@ -315,7 +315,7 @@ module.exports = function(grunt) {
         files: [
           // The source files are needed by the embedded examples in the docs app.
           {
-            src: 'build/angular*.{js.map,min.js}',
+            src: 'build/angular*.{js,js.map,min.js}',
             dest: 'uploadDocs/',
             expand: true,
             flatten: true

docs/content/guide/external-resources.ngdoc

@@ -48,7 +48,7 @@ This is a collection of external, 3rd party resources for learning and developin
 
 * **Django:** [Tutorial](http://blog.mourafiq.com/post/55034504632/end-to-end-web-app-with-django-rest-framework), [Integrating AngularJS with Django](http://django-angular.readthedocs.org/en/latest/integration.html), [Getting Started with Django Rest Framework and AngularJS](http://blog.kevinastone.com/getting-started-with-django-rest-framework-and-angularjs.html)
 * **FireBase:** [AngularFire](http://angularfire.com/), [Realtime Apps with AngularJS and FireBase (video)](http://www.youtube.com/watch?v=C7ZI7z7qnHU)
-* **Google Cloud Platform: **[with Cloud Endpoints](https://cloud.google.com/developers/articles/angularjs-cloud-endpoints-recipe-for-building-modern-web-applications/), [with Go](https://github.com/GoogleCloudPlatform/appengine-angular-gotodos)
+* **Google Cloud Platform:** [with Go](https://github.com/GoogleCloudPlatform/appengine-angular-gotodos)
 * **Hood.ie:** [60 Minutes to Awesome](http://www.roberthorvick.com/2013/06/30/todomvc-angularjs-hood-ie-60-minutes-to-awesome/)
 * **MEAN Stack: **[Blog post](http://blog.mongodb.org/post/49262866911/the-mean-stack-mongodb-expressjs-angularjs-and), [Setup](http://thecodebarbarian.wordpress.com/2013/07/22/introduction-to-the-mean-stack-part-one-setting-up-your-tools/), [GDL Video](https://developers.google.com/live/shows/913996610)
 * **Rails: **[Tutorial](http://coderberry.me/blog/2013/04/22/angularjs-on-rails-4-part-1/), [AngularJS with Rails4](https://shellycloud.com/blog/2013/10/how-to-integrate-angularjs-with-rails-4), [angularjs-rails](https://github.com/hiravgandhi/angularjs-rails)

scripts/code.angularjs.org-firebase/functions/index.js

@@ -61,12 +61,8 @@ function sendStoredFile(request, response) {
       return new Promise((resolve, reject) => {
 
         const readStream = file.createReadStream()
-          .on('error', error => {
-            reject(error);
-          })
-          .on('response', () => {
-            resolve(response);
-          });
+          .on('error', reject)
+          .on('finish', resolve);
 
         response
           .status(200)
@@ -75,7 +71,7 @@ function sendStoredFile(request, response) {
             'Cache-Control': `public, max-age=${BROWSER_CACHE_DURATION}, s-maxage=${CDN_CACHE_DURATION}`
           });
 
-          readStream.pipe(response);
+        readStream.pipe(response);
       });
 
     });