# HG changeset patch
# User Chris Cannam
# Date 1531475073 -3600
# Node ID 3a510bf6a9bc9114d9b458b2f119b33b726c2ae8
# Parent  fb03674bdde17965f132f4615e84f82418b3e430# Parent  3585a1b16dc3dafb90f97aa4378186671856e59a
Merge from live branch

diff -r fb03674bdde1 -r 3a510bf6a9bc Gemfile.lock
--- a/Gemfile.lock	Thu Feb 22 09:04:43 2018 +0000
+++ b/Gemfile.lock	Fri Jul 13 10:44:33 2018 +0100
@@ -33,7 +33,7 @@
     arel (3.0.3)
     awesome_nested_set (2.1.6)
       activerecord (>= 3.0.0)
-    bibtex-ruby (4.4.4)
+    bibtex-ruby (4.4.5)
       latex-decode (~> 0.0)
     builder (3.0.0)
     capybara (2.1.0)
@@ -42,48 +42,49 @@
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    childprocess (0.7.1)
+    childprocess (0.8.0)
       ffi (~> 1.0, >= 1.0.11)
-    citeproc (1.0.5)
-      namae (~> 0.8)
-    citeproc-ruby (1.1.7)
+    citeproc (1.0.8)
+      namae (~> 1.0)
+    citeproc-ruby (1.1.8)
       citeproc (>= 1.0.4, < 2.0)
       csl (~> 1.4)
-    coderay (1.1.1)
-    csl (1.4.5)
-      namae (~> 0.7)
+    coderay (1.1.2)
+    concurrent-ruby (1.0.5)
+    csl (1.5.0)
+      namae (~> 1.0)
     csl-styles (1.0.1.8)
       csl (~> 1.0)
     erubis (2.7.0)
     fastercsv (1.5.5)
-    ffi (1.9.18)
+    ffi (1.9.22)
     hike (1.2.3)
-    i18n (0.8.6)
-    iconv (1.0.4)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
+    iconv (1.0.5)
     journey (1.0.4)
     jquery-rails (2.0.3)
       railties (>= 3.1.0, < 5.0)
       thor (~> 0.14)
     json (1.8.6)
-    latex-decode (0.2.2)
-      unicode (~> 0.4)
+    latex-decode (0.3.1)
     mail (2.5.5)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     metaclass (0.0.4)
     mime-types (1.25.1)
-    mini_portile2 (2.2.0)
+    mini_portile2 (2.3.0)
     mocha (1.0.0)
       metaclass (~> 0.0.1)
-    multi_json (1.12.1)
-    namae (0.11.3)
+    multi_json (1.13.1)
+    namae (1.0.1)
     net-ldap (0.3.1)
-    nokogiri (1.8.0)
-      mini_portile2 (~> 2.2.0)
+    nokogiri (1.8.2)
+      mini_portile2 (~> 2.3.0)
     pg (0.20.0)
     polyglot (0.3.5)
     rack (1.4.7)
-    rack-cache (1.7.0)
+    rack-cache (1.7.1)
       rack (>= 0.4)
     rack-openid (1.4.2)
       rack (>= 1.1.0)
@@ -114,9 +115,9 @@
     rmagick (2.16.0)
     ruby-openid (2.3.0)
     rubyzip (1.2.1)
-    selenium-webdriver (3.5.1)
+    selenium-webdriver (3.9.0)
       childprocess (~> 0.5)
-      rubyzip (~> 1.0)
+      rubyzip (~> 1.2)
     shoulda (3.3.2)
       shoulda-context (~> 1.0.1)
       shoulda-matchers (~> 1.4.1)
@@ -128,16 +129,15 @@
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    thor (0.19.4)
+    thor (0.20.0)
     tilt (1.4.1)
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.53)
-    unicode (0.4.4.4)
     xpath (2.1.0)
       nokogiri (~> 1.3)
-    yard (0.9.9)
+    yard (0.9.12)
 
 PLATFORMS
   ruby
@@ -175,4 +175,4 @@
   yard
 
 BUNDLED WITH
-   1.15.4
+   1.16.1
diff -r fb03674bdde1 -r 3a510bf6a9bc deploy/provision.d/190-reminders.sh
--- a/deploy/provision.d/190-reminders.sh	Thu Feb 22 09:04:43 2018 +0000
+++ b/deploy/provision.d/190-reminders.sh	Fri Jul 13 10:44:33 2018 +0100
@@ -34,6 +34,10 @@
     up the server's outgoing mail support and also edit the application
     email settings in config/configuration.yml.
 
+*** CRON EMAIL
+
+    Ensure the MAILTO value in /etc/crontab is set to something real.
+
 *** STATIC FRONT PAGE
 
     We have set up only the code/repository site -- if you want a