Merge branch 'master' into dev/2.6/add-user-status

Author: scott

Gemfile.lock

@@ -360,7 +360,7 @@ GEM
     mime-types (3.2.2)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2019.0331)
-    mini_magick (4.9.3)
+    mini_magick (4.9.5)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
     minitest (5.11.3)
@@ -418,16 +418,16 @@ GEM
     parser (2.6.3.0)
       ast (~> 2.4.0)
     pg (0.20.0)
-    pg_search (2.2.0)
+    pg_search (2.3.0)
       activerecord (>= 4.2)
       activesupport (>= 4.2)
     polyglot (0.3.5)
     premailer (1.11.1)
       addressable
       css_parser (>= 1.6.0)
       htmlentities (>= 4.0.0)
-    premailer-rails (1.10.2)
-      actionmailer (>= 3, < 6)
+    premailer-rails (1.10.3)
+      actionmailer (>= 3)
       premailer (~> 1.7, >= 1.7.9)
     pry (0.12.2)
       coderay (~> 1.1.0)
@@ -477,7 +477,7 @@ GEM
     rainbow (2.2.2)
       rake
     raindrops (0.19.0)
-    rake (12.3.2)
+    rake (12.3.3)
     ranked-model (0.4.1)
       activerecord (>= 3.1.12)
     rb-fsevent (0.10.3)
@@ -504,7 +504,7 @@ GEM
     route_translator (4.4.1)
       actionpack (>= 3.2, < 5.0)
       activesupport (>= 3.2, < 5.0)
-    rubocop (0.72.0)
+    rubocop (0.73.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.6)