Merge branch 'release/0.38.2.0'

mysociety · Sep 25, 2020 · d05530a · d05530a
2 parents a086444 + d23b1c9
commit d05530a
Show file tree

Hide file tree

Showing 36 changed files with 807 additions and 219 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -32,6 +32,9 @@ updates:
       - dependency-name: rubocop
         versions:
         - ">= 0.82.0"
+      - dependency-name: rubocop-performance
+        versions:
+        - ">= 1.6.0"
       - dependency-name: sass-rails
         versions:
         - ">= 5.0.8"
@@ -73,3 +76,8 @@ updates:
       - dependency-name: sass-rails
         versions:
         - ">= 6.0.0"
+
+      # capistrano 3 is a major API change that we're unlikely to support
+      - dependency-name: capistrano
+        versions:
+        - ">= 3.0.0"
diff --git a/Gemfile b/Gemfile
@@ -85,13 +85,14 @@ def rails_upgrade?
 end
 
 gem 'rails', rails_upgrade? ? '~> 6.0.3' : '~> 5.2.4'
+  gem 'nio4r', rails_upgrade? ? nil : '< 2.5.3'
 
 gem 'pg', '~> 1.2.3'
 
 # New gem releases aren't being done. master is newer and supports Rails > 3.0
 gem 'acts_as_versioned', :git => 'https://github.com/technoweenie/acts_as_versioned.git', :ref => '63b1fc8529d028'
 gem 'active_model_otp'
-gem 'bcrypt', '~> 3.1.13'
+gem 'bcrypt', '~> 3.1.16'
 gem 'cancancan', '~> 3.1.0'
 gem 'charlock_holmes', '~> 0.7.7'
 gem 'dalli', '~> 2.7.0'
@@ -106,7 +107,7 @@ gem 'jquery-ui-rails', '~> 6.0.0'
 gem 'json', '~> 2.3.1'
 gem 'holidays', '~> 7.1.0'
 gem 'iso_country_codes', '~> 0.7.8'
-gem 'mail', rails_upgrade? ? '~> 2.7.1' : '~> 2.6.6'
+gem 'mail', '~> 2.7.1'
 gem 'maxmind-db', '~> 1.0.0'
 gem 'mahoro', '~> 0.5'
 gem 'nokogiri', '~> 1.10.10'
@@ -122,7 +123,7 @@ gem 'rubyzip', '~> 1.3.0', '< 2.0.0'
 gem 'secure_headers', '~> 6.3.1'
 gem 'statistics2', '~> 0.54'
 gem 'strip_attributes', :git => 'https://github.com/mysociety/strip_attributes.git', :branch => 'globalize3-rails5.2'
-gem 'stripe', '~> 5.22.0'
+gem 'stripe', '~> 5.25.0'
 gem 'syslog_protocol', '~> 0.9.0'
 gem 'thin', '~> 1.7.2'
 gem 'vpim', '~> 13.11.11'
@@ -135,7 +136,7 @@ gem 'zip_tricks', '~> 5.3.1'
 gem 'gender_detector', '~> 2.0.0'
 
 # Gems related to internationalisation
-gem 'i18n', '~> 1.8.3'
+gem 'i18n', '~> 1.8.5'
 gem 'rails-i18n', rails_upgrade? ? '~> 6.0.0' : '~> 5.1.0'
 gem 'gettext_i18n_rails', '~> 1.8.1'
   gem 'fast_gettext', '< 2.0.3'
@@ -160,7 +161,7 @@ gem 'therubyracer', '~> 0.12.0'
 gem 'alaveteli_features', :path => 'gems/alaveteli_features'
 
 group :test do
-  gem 'webmock', '~> 3.8.3'
+  gem 'webmock', '~> 3.9.1'
   gem 'coveralls', '~> 0.8.23', require: false
   gem 'capybara', '~> 3.15.1'
   gem 'stripe-ruby-mock', git: 'https://github.com/stripe-ruby-mock/stripe-ruby-mock',
@@ -181,8 +182,8 @@ end
 group :development do
   gem 'annotate', '< 3.1.1'
   gem 'capistrano', '~> 2.15.0', '< 3.0.0'
-    gem 'net-ssh', ['~> 2.9.0', '< 3.0.0']
-      gem 'net-ssh-gateway', ['>= 1.1.0', '< 2.0.0']
+    gem 'net-ssh', '~> 6.1.0'
+      gem 'net-ssh-gateway', '>= 1.1.0', '< 3.0.0'
   gem 'launchy', '< 2.5.0'
   gem 'listen', '>= 3.0.5', '< 3.3'
   gem 'web-console', '>= 3.3.0'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -45,46 +45,46 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.2.4.3)
-      actionpack (= 5.2.4.3)
+    actioncable (5.2.4.4)
+      actionpack (= 5.2.4.4)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.4.3)
-      actionpack (= 5.2.4.3)
-      actionview (= 5.2.4.3)
-      activejob (= 5.2.4.3)
+    actionmailer (5.2.4.4)
+      actionpack (= 5.2.4.4)
+      actionview (= 5.2.4.4)
+      activejob (= 5.2.4.4)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.4.3)
-      actionview (= 5.2.4.3)
-      activesupport (= 5.2.4.3)
+    actionpack (5.2.4.4)
+      actionview (= 5.2.4.4)
+      activesupport (= 5.2.4.4)
       rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.4.3)
-      activesupport (= 5.2.4.3)
+    actionview (5.2.4.4)
+      activesupport (= 5.2.4.4)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
     active_model_otp (2.0.1)
       activemodel
       rotp (~> 5.0.0)
-    activejob (5.2.4.3)
-      activesupport (= 5.2.4.3)
+    activejob (5.2.4.4)
+      activesupport (= 5.2.4.4)
       globalid (>= 0.3.6)
-    activemodel (5.2.4.3)
-      activesupport (= 5.2.4.3)
-    activerecord (5.2.4.3)
-      activemodel (= 5.2.4.3)
-      activesupport (= 5.2.4.3)
+    activemodel (5.2.4.4)
+      activesupport (= 5.2.4.4)
+    activerecord (5.2.4.4)
+      activemodel (= 5.2.4.4)
+      activesupport (= 5.2.4.4)
       arel (>= 9.0)
-    activestorage (5.2.4.3)
-      actionpack (= 5.2.4.3)
-      activerecord (= 5.2.4.3)
+    activestorage (5.2.4.4)
+      actionpack (= 5.2.4.4)
+      activerecord (= 5.2.4.4)
       marcel (~> 0.3.1)
-    activesupport (5.2.4.3)
+    activesupport (5.2.4.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -96,7 +96,7 @@ GEM
       rake (>= 10.4, < 14.0)
     arel (9.0.0)
     ast (2.4.1)
-    bcrypt (3.1.13)
+    bcrypt (3.1.16)
     bindex (0.7.0)
     bootstrap-sass (2.3.2.2)
       sass (~> 3.2)
@@ -122,7 +122,7 @@ GEM
       xpath (~> 3.2)
     charlock_holmes (0.7.7)
     coderay (1.1.2)
-    concurrent-ruby (1.1.6)
+    concurrent-ruby (1.1.7)
     coveralls (0.8.23)
       json (>= 1.8, < 3)
       simplecov (~> 0.16.1)
@@ -175,7 +175,7 @@ GEM
     hodel_3000_compliant_logger (0.1.1)
     holidays (7.1.0)
     htmlentities (4.3.4)
-    i18n (1.8.3)
+    i18n (1.8.5)
       concurrent-ruby (~> 1.0)
     icalendar (2.5.3)
       ice_cube (~> 0.16)
@@ -196,12 +196,12 @@ GEM
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     locale (2.1.3)
-    loofah (2.6.0)
+    loofah (2.7.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mahoro (0.5)
-    mail (2.6.6)
-      mime-types (>= 1.16, < 4)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
     marcel (0.3.3)
       mimemagic (~> 0.3.2)
     maxmind-db (1.0.0)
@@ -211,17 +211,17 @@ GEM
     mini_magick (4.10.1)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
-    minitest (5.14.1)
+    minitest (5.14.2)
     money (6.13.8)
       i18n (>= 0.6.4, <= 2)
     multi_json (1.13.1)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
     net-sftp (2.1.2)
       net-ssh (>= 2.6.5)
-    net-ssh (2.9.4)
-    net-ssh-gateway (1.3.0)
-      net-ssh (>= 2.6.5)
+    net-ssh (6.1.0)
+    net-ssh-gateway (2.0.0)
+      net-ssh (>= 4.0.0)
     nio4r (2.5.2)
     nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
@@ -239,26 +239,26 @@ GEM
     pry-byebug (3.7.0)
       byebug (~> 11.0)
       pry (~> 0.10)
-    public_suffix (4.0.5)
+    public_suffix (4.0.6)
     rack (2.2.3)
     rack-ssl (1.4.1)
       rack
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rack-utf8_sanitizer (1.7.0)
       rack (>= 1.0, < 3.0)
-    rails (5.2.4.3)
-      actioncable (= 5.2.4.3)
-      actionmailer (= 5.2.4.3)
-      actionpack (= 5.2.4.3)
-      actionview (= 5.2.4.3)
-      activejob (= 5.2.4.3)
-      activemodel (= 5.2.4.3)
-      activerecord (= 5.2.4.3)
-      activestorage (= 5.2.4.3)
-      activesupport (= 5.2.4.3)
+    rails (5.2.4.4)
+      actioncable (= 5.2.4.4)
+      actionmailer (= 5.2.4.4)
+      actionpack (= 5.2.4.4)
+      actionview (= 5.2.4.4)
+      activejob (= 5.2.4.4)
+      activemodel (= 5.2.4.4)
+      activerecord (= 5.2.4.4)
+      activestorage (= 5.2.4.4)
+      activesupport (= 5.2.4.4)
       bundler (>= 1.3.0)
-      railties (= 5.2.4.3)
+      railties (= 5.2.4.4)
       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
@@ -272,9 +272,9 @@ GEM
     rails-i18n (5.1.3)
       i18n (>= 0.7, < 2)
       railties (>= 5.0, < 6)
-    railties (5.2.4.3)
-      actionpack (= 5.2.4.3)
-      activesupport (= 5.2.4.3)
+    railties (5.2.4.4)
+      actionpack (= 5.2.4.4)
+      activesupport (= 5.2.4.4)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
@@ -356,7 +356,7 @@ GEM
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     statistics2 (0.54)
-    stripe (5.22.0)
+    stripe (5.25.0)
     sync (0.5.0)
     syslog_protocol (0.9.2)
     term-ansicolor (1.7.1)
@@ -388,11 +388,11 @@ GEM
       activemodel (>= 5.0)
       bindex (>= 0.4.0)
       railties (>= 5.0)
-    webmock (3.8.3)
+    webmock (3.9.1)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    websocket-driver (0.7.2)
+    websocket-driver (0.7.3)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     will_paginate (3.3.0)
@@ -410,7 +410,7 @@ DEPENDENCIES
   acts_as_versioned!
   alaveteli_features!
   annotate (< 3.1.1)
-  bcrypt (~> 3.1.13)
+  bcrypt (~> 3.1.16)
   bootstrap-sass (~> 2.3.2.2)
   bullet (~> 6.1.0)
   cancancan (~> 3.1.0)
@@ -431,7 +431,7 @@ DEPENDENCIES
   gnuplot (~> 2.6.0)
   holidays (~> 7.1.0)
   htmlentities (~> 4.3.0)
-  i18n (~> 1.8.3)
+  i18n (~> 1.8.5)
   icalendar (~> 2.5.3)
   iso_country_codes (~> 0.7.8)
   jquery-rails (~> 4.4.0)
@@ -441,13 +441,14 @@ DEPENDENCIES
   listen (>= 3.0.5, < 3.3)
   locale (~> 2.1.3)
   mahoro (~> 0.5)
-  mail (~> 2.6.6)
+  mail (~> 2.7.1)
   maxmind-db (~> 1.0.0)
   mime-types (< 3.0.0)
   mini_magick (~> 4.10.0)
   money (~> 6.13.8)
-  net-ssh (~> 2.9.0, < 3.0.0)
-  net-ssh-gateway (>= 1.1.0, < 2.0.0)
+  net-ssh (~> 6.1.0)
+  net-ssh-gateway (>= 1.1.0, < 3.0.0)
+  nio4r (< 2.5.3)
   nokogiri (~> 1.10.10)
   oink (~> 0.10.1)
   open4 (~> 1.3.0)
@@ -474,7 +475,7 @@ DEPENDENCIES
   secure_headers (~> 6.3.1)
   statistics2 (~> 0.54)
   strip_attributes!
-  stripe (~> 5.22.0)
+  stripe (~> 5.25.0)
   stripe-ruby-mock!
   syslog_protocol (~> 0.9.0)
   therubyracer (~> 0.12.0)
@@ -484,7 +485,7 @@ DEPENDENCIES
   unidecoder (~> 1.1.0)
   vpim (~> 13.11.11)
   web-console (>= 3.3.0)
-  webmock (~> 3.8.3)
+  webmock (~> 3.9.1)
   will_paginate (~> 3.3.0)
   xapian-full-alaveteli (~> 1.4.11.1)
   xml-simple (~> 1.1.0)