Merge branch 'master' into docker/enhanced

# Conflicts: # Gemfile.lock
helpyio · Jan 15, 2019 · dbf5960 · dbf5960
2 parents 4177955 + c5eb5d5
commit dbf5960
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/helpyio/helpy_imap
-  revision: 85f944a0d79325662c6f7e47e1a037640875f88d
+  revision: 16fe681c2e2053ad015ee70a1d60c4f135ecbe25
   branch: master
   specs:
     helpy_imap (1.0)
@@ -117,7 +117,7 @@ GEM
       mime-types (>= 1.16)
     celluloid (0.16.0)
       timers (~> 4.0.0)
-    chartkick (3.0.1)
+    chartkick (3.0.2)
     childprocess (0.9.0)
       ffi (~> 1.0, >= 1.0.11)
     chromedriver-helper (2.1.0)
@@ -185,7 +185,7 @@ GEM
       unf (>= 0.0.5, < 1.0.0)
     dry-inflector (0.1.2)
     equalizer (0.0.11)
-    erubi (1.7.1)
+    erubi (1.8.0)
     erubis (2.7.0)
     excon (0.62.0)
     execjs (2.7.0)
@@ -356,7 +356,7 @@ GEM
     fog-xml (0.1.3)
       fog-core
       nokogiri (>= 1.5.11, < 2.0.0)
-    font-awesome-sass (5.5.0.1)
+    font-awesome-sass (5.6.1)
       sassc (>= 1.11)
     formatador (0.2.5)
     foundation_emails (2.2.1.0)
@@ -535,7 +535,7 @@ GEM
     mustermann-grape (1.0.0)
       mustermann (~> 1.0.0)
     netrc (0.11.0)
-    nokogiri (1.9.1)
+    nokogiri (1.10.0)
       mini_portile2 (~> 2.4.0)
     oauth (0.5.4)
     oauth2 (1.4.1)
@@ -643,8 +643,8 @@ GEM
     ranked-model (0.4.2)
       activerecord (>= 4.1.16)
     rb-fsevent (0.10.3)
-    rb-inotify (0.9.10)
-      ffi (>= 0.5.0, < 2)
+    rb-inotify (0.10.0)
+      ffi (~> 1.0)
     rbovirt (0.1.7)
       nokogiri
       rest-client (> 1.7.0)
@@ -678,7 +678,7 @@ GEM
     route_translator (4.4.1)
       actionpack (>= 3.2, < 5.0)
       activesupport (>= 3.2, < 5.0)
-    rubocop (0.61.1)
+    rubocop (0.62.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.5, != 2.5.1.1)
@@ -767,7 +767,7 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.5)
-    unicode-display_width (1.4.0)
+    unicode-display_width (1.4.1)
     unicorn (5.4.1)
       kgio (~> 2.6)
       raindrops (~> 0.7)

diff --git a/app/assets/javascripts/shortcuts.js b/app/assets/javascripts/shortcuts.js
@@ -1,6 +1,6 @@
 Helpy.showShortcuts = function() {
   if ($('#shortcutmodal').size() === 0) {
-    $('body').append("<div id='shortcutmodal' class=\"modal\" tabindex=\"-1\" role=\"dialog\" data-backdrop=\"static\">" +
+    $('body').append("<div id='shortcutmodal' class=\"modal\" tabindex=\"-1\" role=\"dialog\" data-backdrop=\"true\">" +
         "<div class=\"modal-dialog modal-lg\">" +
         "	<div class=\"modal-content\">" +
         "		<iframe src=\"/admin/shortcuts\" width=\"100%\" height=\"900\" frameborder=\"no\" scrolling=\"auto\"></iframe>" +