[devdocsgjs/main: 666/1867] Automatically deploy when build succeeds on master

[Andy Holmes <andyholmes src gnome org>]

commit d477ed180c928e77ec23bc0ec27124263f38381e
Author: Jasper van Merle <jaspervmerle gmail com>
Date:   Fri Jul 19 22:38:26 2019 +0200

    Automatically deploy when build succeeds on master

 .travis.yml         | 8 ++++++++
 docs/maintainers.md | 7 +++----
 2 files changed, 11 insertions(+), 4 deletions(-)
---
diff --git a/.travis.yml b/.travis.yml
index d5e5a6aa..0e64a76a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,3 +5,11 @@ cache: bundler
 before_script:
   - gem update --system
   - gem install bundler
+
+deploy:
+  provider: heroku
+  app: devdocs
+  on:
+    branch: master
+  api_key:
+    secure: 
"4p1klvWJZSOImzFcKOduILjP93hlOlAhceWlYMKS4tU+TCFE8qTBzdKdFPSCsCgjB+YR9pBss+L0lJpVVMjSwFHXqpKe6EeUSltO2k7DFHfW7kXLUM/L0AfqXz+YXk76XUyZMhvOEbldPfaMaj10e8vgDOQCSHABDyK/4CU+hnI="
diff --git a/docs/maintainers.md b/docs/maintainers.md
index 1369816d..48d50b81 100644
--- a/docs/maintainers.md
+++ b/docs/maintainers.md
@@ -21,8 +21,7 @@ The process for updating docs is as follow:
 - Commit the changes (protip: use the `thor docs:commit` command documented below).
 - Optional: do more updates.
 - Run `thor docs:upload` (documented below).
-- [Deploy the app](#deploying-devdocs) and verify that everything works in production.
-- Push to GitHub.
+- Push to GitHub to [deploy the app](#deploying-devdocs) and verify that everything works in production.
 - Run `thor docs:clean` (documented below).
 
 Note: changes to `public/docs/docs.json` should never be committed. This file reflects which documentations 
have been downloaded or generated locally, which is always none on a fresh `git clone`.
@@ -82,13 +81,13 @@ In addition to the [publicly-documented commands](https://github.com/freeCodeCam
 
 ## Deploying DevDocs
 
-Once docs have been uploaded via `thor docs:upload` (if applicable), deploying DevDocs is as simple as 
running `git push heroku master`. See [Heroku's documentation](https://devcenter.heroku.com/articles/git) for 
more information.
+Once docs have been uploaded via `thor docs:upload` (if applicable), you can push to the DevDocs master 
branch (or merge the PR containing the updates). If the Travis build succeeds, the Heroku application will be 
deployed automatically.
 
 - If you're deploying documentation updates, verify that the documentations work properly once the deploy is 
done (you will need to reload [devdocs.io](https://devdocs.io/) a couple times for the application cache to 
update and the new version to load).
 - If you're deploying frontend changes, monitor [Sentry](https://sentry.io/devdocs/devdocs-js/) for new JS 
errors once the deploy is done.
 - If you're deploying server changes, monitor New Relic (accessible through [the Heroku 
dashboard](https://dashboard.heroku.com/apps/devdocs)) for Ruby exceptions and throughput or response time 
changes once the deploy is done.
 
-If any issue arises, run `heroku rollback` to rollback to the previous of the app (this can also be done via 
Heroku's UI). Note that this will not revert changes made to documentation files that were uploaded via `thor 
docs:upload`.  Try and fix the issue as quickly as possible, then re-deploy the app. Reach out to other 
maintainers if you need help.
+If any issue arises, run `heroku rollback` to rollback to the previous version of the app (this can also be 
done via Heroku's UI). Note that this will not revert changes made to documentation files that were uploaded 
via `thor docs:upload`.  Try and fix the issue as quickly as possible, then re-deploy the app. Reach out to 
other maintainers if you need help.
 
 If this is your first deploy, make sure another maintainer is around to assist.