[devdocsgjs/main: 686/1867] Fix merge conflicts

[Andy Holmes <andyholmes src gnome org>]

commit 6e917001ceadac77181466a31e8662c3b88c17a5
Merge: 5ac8d55e 1fd1ed9d
Author: Jasper van Merle <jaspervmerle gmail com>
Date:   Sat Jul 20 03:55:27 2019 +0200

    Fix merge conflicts

 .gitignore                                         |   1 +
 .slugignore                                        |   3 +-
 .travis.yml                                        |   8 +
 Dockerfile                                         |   1 +
 Dockerfile-alpine                                  |   1 +
 Gemfile                                            |   2 +
 Gemfile.lock                                       |   5 +
 README.md                                          |  10 +-
 assets/images/.gitignore                           |   1 +
 assets/images/docs-1.png                           | Bin 46181 -> 0 bytes
 assets/images/docs-1 2x png                        | Bin 122108 -> 0 bytes
 assets/images/docs-2.png                           | Bin 20060 -> 0 bytes
 assets/images/docs-2 2x png                        | Bin 48657 -> 0 bytes
 assets/javascripts/app/app.coffee                  |  21 +-
 assets/javascripts/app/appcache.coffee             |  42 ----
 assets/javascripts/app/config.coffee.erb           |   2 +
 assets/javascripts/app/serviceworker.coffee        |  49 +++++
 assets/javascripts/app/settings.coffee             |  33 ++++
 assets/javascripts/app/update_checker.coffee       |   6 +-
 assets/javascripts/lib/page.coffee                 |  18 +-
 assets/javascripts/lib/util.coffee                 |   4 +
 assets/javascripts/models/doc.coffee               |   4 +-
 assets/javascripts/news.json                       |   4 +
 assets/javascripts/templates/error_tmpl.coffee     |  10 +-
 assets/javascripts/templates/notif_tmpl.coffee     |   6 +
 .../javascripts/templates/pages/about_tmpl.coffee  |   3 +-
 .../templates/pages/offline_tmpl.coffee            |  13 +-
 .../templates/pages/root_tmpl.coffee.erb           |   4 +-
 .../templates/pages/settings_tmpl.coffee           |   8 +
 assets/javascripts/tracking.js                     |  50 ++---
 assets/javascripts/views/content/entry_page.coffee |   2 +-
 .../javascripts/views/content/settings_page.coffee |  21 +-
 assets/javascripts/views/layout/document.coffee    |  12 +-
 assets/javascripts/views/layout/resizer.coffee     |  11 +-
 assets/javascripts/views/layout/settings.coffee    |  10 +-
 assets/javascripts/views/search/search.coffee      |   8 +
 .../javascripts/views/search/search_scope.coffee   |  28 ++-
 assets/javascripts/views/sidebar/sidebar.coffee    |   2 +-
 assets/stylesheets/application.css.scss            |   7 +-
 assets/stylesheets/components/_header.scss         |   1 +
 assets/stylesheets/components/_notif.scss          |   4 +
 assets/stylesheets/global/_icons.scss              | 182 ------------------
 assets/stylesheets/global/_icons.scss.erb          |  43 +++++
 docs/maintainers.md                                |   9 +-
 lib/app.rb                                         |  66 ++++---
 lib/docs/core/scrapers/file_scraper.rb             |   4 +-
 lib/tasks/assets.thor                              |   3 +
 lib/tasks/sprites.thor                             | 211 +++++++++++++++++++++
 public/docs/docs.json                              |   1 -
 public/icons/docs-1.pxm                            | Bin 3352748 -> 0 bytes
 public/icons/docs-1 2x pxm                         | Bin 3669552 -> 0 bytes
 public/icons/docs-2.pxm                            | Bin 1411876 -> 0 bytes
 public/icons/docs-2 2x pxm                         | Bin 1523904 -> 0 bytes
 public/icons/docs/bluebird/16 2x png               | Bin 1018 -> 2273 bytes
 public/images/webapp-icon-192.png                  | Bin 0 -> 32187 bytes
 public/manifest.json                               |   6 +
 test/app_test.rb                                   |  81 --------
 test/lib/docs/core/scrapers/file_scraper_test.rb   |   4 +-
 views/app.erb                                      |  14 +-
 views/index.erb                                    |   5 +-
 views/manifest.erb                                 |  14 --
 views/other.erb                                    |   5 +-
 views/service-worker.js.erb                        |  49 +++++
 views/unsupported.erb                              |   6 +-
 64 files changed, 645 insertions(+), 473 deletions(-)
---
diff --cc .travis.yml
index e8d3d588,0e64a76a..f3839425
--- a/.travis.yml
+++ b/.travis.yml
@@@ -6,6 -6,10 +6,14 @@@ before_script
    - gem update --system
    - gem install bundler
  
 +script:
 +  - if [ "$TRAVIS_EVENT_TYPE" != "cron" ]; then bundle exec rake; fi
 +  - if [ "$TRAVIS_EVENT_TYPE" = "cron" ]; then bundle exec thor updates:check --github-token $GH_TOKEN 
--upload; fi
++
+ deploy:
+   provider: heroku
+   app: devdocs
+   on:
+     branch: master
+   api_key:
+     secure: 
"4p1klvWJZSOImzFcKOduILjP93hlOlAhceWlYMKS4tU+TCFE8qTBzdKdFPSCsCgjB+YR9pBss+L0lJpVVMjSwFHXqpKe6EeUSltO2k7DFHfW7kXLUM/L0AfqXz+YXk76XUyZMhvOEbldPfaMaj10e8vgDOQCSHABDyK/4CU+hnI="
diff --cc Gemfile.lock
index 3ed8570b,4ae8c270..b7023a31
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@@ -155,7 -157,7 +159,8 @@@ DEPENDENCIE
    sinatra-contrib
    sprockets
    sprockets-helpers
 +  terminal-table
+   sprockets-sass
    thin
    thor
    tty-pager