Fix merge conflicts

Author: jmerle

.travis.yml

@@ -1,4 +1,7 @@
 language: ruby
+
+cache: bundler
+
 before_script:
   - gem update --system
   - gem install bundler

Gemfile

@@ -11,6 +11,7 @@ group :app do
   gem 'rack'
   gem 'sinatra'
   gem 'sinatra-contrib'
+  gem 'rack-ssl-enforcer'
   gem 'thin'
   gem 'sprockets'
   gem 'sprockets-helpers'

Gemfile.lock

@@ -1,13 +1,13 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.0)
+    activesupport (5.2.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    backports (3.11.3)
-    better_errors (2.4.0)
+    backports (3.11.4)
+    better_errors (2.5.0)
       coderay (>= 1.0.0)
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
@@ -28,66 +28,67 @@ GEM
     exifr (1.3.4)
     ffi (1.9.25)
     fspath (3.1.0)
-    highline (1.7.10)
+    highline (2.0.0)
     html-pipeline (2.8.4)
       activesupport (>= 2)
       nokogiri (>= 1.4)
-    i18n (1.0.1)
+    i18n (1.1.1)
       concurrent-ruby (~> 1.0)
-    image_optim (0.26.1)
+    image_optim (0.26.3)
       exifr (~> 1.2, >= 1.2.2)
       fspath (~> 3.0)
-      image_size (~> 1.5)
+      image_size (>= 1.5, < 3)
       in_threads (~> 1.3)
       progress (~> 3.0, >= 3.0.1)
     image_optim_pack (0.5.1)
       fspath (>= 2.1, < 4)
       image_optim (~> 0.19)
-    image_size (1.5.0)
+    image_size (2.0.0)
     in_threads (1.5.0)
     method_source (0.9.0)
     mini_portile2 (2.3.0)
     minitest (5.11.3)
     multi_json (1.13.1)
-    mustermann (1.0.2)
-    newrelic_rpm (5.2.0.345)
-    nokogiri (1.8.4)
+    mustermann (1.0.3)
+    newrelic_rpm (5.4.0.347)
+    nokogiri (1.8.5)
       mini_portile2 (~> 2.3.0)
     options (2.3.2)
-    progress (3.4.0)
-    progress_bar (1.2.0)
-      highline (~> 1.6)
+    progress (3.5.0)
+    progress_bar (1.3.0)
+      highline (>= 1.6, < 3)
       options (~> 2.3.0)
     pry (0.11.3)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     rack (2.0.5)
-    rack-protection (2.0.3)
+    rack-protection (2.0.4)
       rack
+    rack-ssl-enforcer (0.2.9)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rake (12.3.1)
     rb-fsevent (0.10.3)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
     rr (1.2.1)
-    sass (3.5.7)
+    sass (3.6.0)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
-    sinatra (2.0.3)
+    sinatra (2.0.4)
       mustermann (~> 1.0)
       rack (~> 2.0)
-      rack-protection (= 2.0.3)
+      rack-protection (= 2.0.4)
       tilt (~> 2.0)
-    sinatra-contrib (2.0.3)
+    sinatra-contrib (2.0.4)
       activesupport (>= 4.0.0)
       backports (>= 2.8.2)
       multi_json
       mustermann (~> 1.0)
-      rack-protection (= 2.0.3)
-      sinatra (= 2.0.3)
+      rack-protection (= 2.0.4)
+      sinatra (= 2.0.4)
       tilt (>= 1.3, < 3)
     sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
@@ -96,9 +97,11 @@ GEM
       sprockets (>= 2.2)
     sprockets-sass (2.0.0.beta2)
       sprockets (>= 2.0, < 4.0)
-    strings (0.1.1)
-      unicode-display_width (~> 1.3.0)
+    strings (0.1.4)
+      strings-ansi (~> 0.1.0)
+      unicode-display_width (~> 1.4.0)
       unicode_utils (~> 1.4.0)
+    strings-ansi (0.1.0)
     thin (1.7.2)
       daemons (~> 1.0, >= 1.0.9)
       eventmachine (~> 1.0, >= 1.0.4)
@@ -116,9 +119,9 @@ GEM
       ethon (>= 0.9.0)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    uglifier (4.1.17)
+    uglifier (4.1.19)
       execjs (>= 0.3.0, < 3)
-    unicode-display_width (1.3.3)
+    unicode-display_width (1.4.0)
     unicode_utils (1.4.0)
     unix_utils (0.0.15)
     yajl-ruby (1.4.1)
@@ -142,6 +145,7 @@ DEPENDENCIES
   progress_bar
   pry (~> 0.11.0)
   rack
+  rack-ssl-enforcer
   rack-test
   rake
   rr
@@ -163,4 +167,4 @@ RUBY VERSION
    ruby 2.5.1p57
 
 BUNDLED WITH
-   1.16.4
+   1.16.6

README.md

@@ -64,14 +64,10 @@ Another driving factor is performance and the fact that everything happens in th
 
 DevDocs being a developer tool, the browser requirements are high:
 
-1. On the desktop:
-  * Recent version of Chrome, Firefox, or Opera
-  * Safari 8+
-  * IE / Edge 10+
-2. On mobile:
-  * iOS 8+
-  * Android 4.1+
-  * Windows Phone 8+
+* Recent versions of Firefox, Chrome, or Opera
+* Safari 9.1+
+* Edge 16+
+* iOS 10+
 
 This allows the code to take advantage of the latest DOM and HTML5 APIs and make developing DevDocs a lot more fun!
 

assets/javascripts/app/app.coffee

@@ -245,7 +245,7 @@
         matchMedia:         !!window.matchMedia
         insertAdjacentHTML: !!document.body.insertAdjacentHTML
         defaultPrevented:     document.createEvent('CustomEvent').defaultPrevented is false
-        cssGradients:         supportsCssGradients()
+        cssVariables:         CSS.supports and CSS.supports('(--t: 0)')
 
       for key, value of features when not value
         Raven.captureMessage "unsupported/#{key}", level: 'info'
@@ -268,9 +268,4 @@
   isInvalidLocation: ->
     @config.env is 'production' and location.host.indexOf(app.config.production_host) isnt 0
 
-supportsCssGradients = ->
-  el = document.createElement('div')
-  el.style.cssText = "background-image: -webkit-linear-gradient(top, #000, #fff); background-image: linear-gradient(to top, #000, #fff);"
-  el.style.backgroundImage.indexOf('gradient') >= 0
-
 $.extend app, Events

assets/javascripts/lib/page.coffee

@@ -190,7 +190,7 @@ isSameOrigin = (url) ->
 
 updateCanonicalLink = ->
   @canonicalLink ||= document.head.querySelector('link[rel="canonical"]')
-  @canonicalLink.setAttribute('href', "http://#{location.host}#{location.pathname}")
+  @canonicalLink.setAttribute('href', "https://#{location.host}#{location.pathname}")
 
 trackers = []
 

assets/javascripts/news.json

@@ -1,5 +1,8 @@
 [
   [
+    "2018-09-23",
+    "New documentations: <a href=\"/puppeteer/\">Puppeteer</a> and <a href=\"/handlebars/\">Handlebars.js</a>"
+  ], [
     "2018-08-12",
     "New documentations: <a href=\"/dart/\">Dart</a> and <a href=\"/qt/\">Qt</a>"
   ], [

assets/javascripts/templates/error_tmpl.coffee

@@ -56,13 +56,10 @@ app.templates.unsupportedBrowser = """
     <h1 class="_fail-title">Your browser is unsupported, sorry.</h1>
     <p class="_fail-text">DevDocs is an API documentation browser which supports the following browsers:
     <ul class="_fail-list">
-      <li>Recent versions of Chrome and Firefox
-      <li>Safari 5.1+
-      <li>Opera 12.1+
-      <li>Internet Explorer 10+
-      <li>iOS 6+
-      <li>Android 4.1+
-      <li>Windows Phone 8+
+      <li>Recent versions of Firefox, Chrome, or Opera
+      <li>Safari 9.1+
+      <li>Edge 16+
+      <li>iOS 10+
     </ul>
     <p class="_fail-text">
       If you're unable to upgrade, I apologize.

assets/javascripts/templates/pages/about_tmpl.coffee

@@ -310,6 +310,11 @@ credits = [
     'GruntJS Team',
     'MIT',
     'https://github.com/gruntjs/grunt-docs/blob/master/package.json#L10'
+  ], [
+    'Handlebars',
+    '2011-2017 Yehuda Katz',
+    'MIT',
+    'https://raw.githubusercontent.com/wycats/handlebars.js/master/LICENSE'
   ], [
     'Haskell',
     'The University of Glasgow',
@@ -560,6 +565,11 @@ credits = [
     '1996-2018 The PostgreSQL Global Development Group<br>&copy; 1994 The Regents of the University of California',
     'PostgreSQL',
     'https://www.postgresql.org/about/licence/'
+  ], [
+    'Puppeteer',
+    '2017 Google Inc',
+    'Apache',
+    'https://raw.githubusercontent.com/GoogleChrome/puppeteer/master/LICENSE'
   ], [
     'Pygame',
     'Pygame Developpers',

assets/javascripts/templates/pages/root_tmpl.coffee.erb

@@ -72,14 +72,3 @@ app.templates.androidWarning = """
     <p>To install DevDocs on your phone, visit <a href="https://devdocs.io" target="_blank" rel="noopener">devdocs.io</a> in Chrome and select "Add to home screen" in the menu.
   </div>
 """
-
-app.templates.httpWarning = """
-  <div class="_intro"><div class="_intro-message">
-    <h2 class="_intro-title">Hi there!</h2>
-    <p>DevDocs is migrating to HTTPS.
-    <p>Please update your bookmarks to point to <a href="https://devdocs.io">https://devdocs.io</a>.
-    <p>When using the HTTPS version, your preferences will carry over automatically, but your offline data will be reset. Simply re-download documentation in the <a href="https://devdocs.io/offline">Offline area</a>, and you'll be all set to use DevDocs securely offline.
-    <p>Sorry for the inconvenience. This migration is needed because browsers are removing support for certain DOM APIs that power DevDocs's offline mode over non-secure origins.
-    <p>Thanks for using DevDocs, and happy coding!
-  </div></div>
-"""