Merge branch 'master' into dev/2.7/prepare-2.7.0

Gemfile.lock

@@ -72,7 +72,7 @@ GEM
     attachinary (1.3.1)
       cloudinary (~> 1.1.0)
       rails (>= 3.2)
-    autoprefixer-rails (9.6.5)
+    autoprefixer-rails (9.7.1)
       execjs
     awesome_print (1.8.0)
     aws_cf_signer (0.1.3)
@@ -96,7 +96,7 @@ GEM
     bootstrap-select-rails (1.12.4)
     bootstrap-switch-rails (3.3.3)
     bootstrap_form (2.7.0)
-    brakeman (4.7.0)
+    brakeman (4.7.1)
     builder (3.2.3)
     bulk_insert (1.7.0)
       activerecord (>= 3.2.0)
@@ -120,7 +120,7 @@ GEM
       mime-types (>= 1.16)
     celluloid (0.16.0)
       timers (~> 4.0.0)
-    chartkick (3.2.1)
+    chartkick (3.2.2)
     childprocess (3.0.0)
     chromedriver-helper (2.1.1)
       archive-zip (~> 0.10)
@@ -186,7 +186,7 @@ GEM
     equalizer (0.0.11)
     erubi (1.9.0)
     erubis (2.7.0)
-    excon (0.67.0)
+    excon (0.68.0)
     execjs (2.7.0)
     factory_bot (5.1.1)
       activesupport (>= 4.2.0)
@@ -269,7 +269,7 @@ GEM
       mail
     groupdate (4.1.2)
       activesupport (>= 4.2)
-    hashid-rails (1.2.2)
+    hashid-rails (1.4.0)
       activerecord (>= 4.0)
       hashids (~> 1.0)
     hashids (1.0.5)
@@ -291,7 +291,7 @@ GEM
       nokogiri
     io-like (0.3.0)
     ipaddress (0.8.3)
-    jaro_winkler (1.5.3)
+    jaro_winkler (1.5.4)
     jbuilder (2.9.1)
       activesupport (>= 4.2.0)
     jquery-fileupload-rails (1.0.0)
@@ -345,7 +345,7 @@ GEM
       celluloid (~> 0.16.0)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
-    loofah (2.3.0)
+    loofah (2.3.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -365,7 +365,7 @@ GEM
     mini_magick (4.9.5)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
-    minitest (5.12.2)
+    minitest (5.13.0)
     minitest-reporters (1.4.1)
       ansi
       builder
@@ -380,7 +380,7 @@ GEM
     mustermann-grape (1.0.0)
       mustermann (~> 1.0.0)
     netrc (0.11.0)
-    nokogiri (1.10.4)
+    nokogiri (1.10.5)
       mini_portile2 (~> 2.4.0)
     oauth (0.5.4)
     oauth2 (1.4.2)
@@ -509,7 +509,7 @@ GEM
     route_translator (4.4.1)
       actionpack (>= 3.2, < 5.0)
       activesupport (>= 3.2, < 5.0)
-    rubocop (0.75.1)
+    rubocop (0.76.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.6)
@@ -527,7 +527,7 @@ GEM
       tilt (>= 1.1, < 3)
     sassc (2.2.1)
       ffi (~> 1.9)
-    scout_apm (2.6.2)
+    scout_apm (2.6.3)
       parser
     scss-lint (0.38.0)
       rainbow (~> 2.0)