Merge branch 'develop'

mysociety · Jul 20, 2021 · 2814da9 · 2814da9
2 parents 81de84a + 2dfe70c
commit 2814da9
Show file tree

Hide file tree

Showing 1,138 changed files with 1,443 additions and 2,359 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,7 +16,8 @@ jobs:
         include:
         - { ruby: 2.5 }
         - { ruby: 2.6 }
-        - { ruby: 2.6, gemfile: 'Gemfile.rails_next' }
+        - { ruby: 2.7 }
+        - { ruby: 2.7, gemfile: 'Gemfile.rails_next' }
 
     services:
       postgres:

diff --git a/Gemfile b/Gemfile
@@ -128,7 +128,7 @@ gem 'syslog_protocol', '~> 0.9.0'
 gem 'thin', '~> 1.8.1'
 gem 'vpim', '~> 13.11.11'
 gem 'will_paginate', '~> 3.3.0'
-gem 'xapian-full-alaveteli', '~> 1.4.11.1'
+gem 'xapian-full-alaveteli', '~> 1.4.18.1'
 gem 'xml-simple', '~> 1.1.8', :require => 'xmlsimple'
 gem 'zip_tricks', '~> 5.6.0'
 
@@ -154,7 +154,7 @@ gem 'mime-types', '< 3.0.0', require: false
 # Assets
 gem 'bootstrap-sass', '~> 2.3.2.2'
 gem 'mini_racer', '~> 0.4.0'
-gem 'sass-rails', '~> 5.0.7'
+gem 'sass-rails', rails_upgrade? ? '~> 5.0.8' : '~> 5.0.7'
 gem 'uglifier', '~> 4.2.0'
 
 # Feature flags

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -89,7 +89,7 @@ GEM
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.7.0)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     annotate (3.1.0)
       activerecord (>= 3.2, < 7.0)
@@ -383,7 +383,7 @@ GEM
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     will_paginate (3.3.0)
-    xapian-full-alaveteli (1.4.11.1)
+    xapian-full-alaveteli (1.4.18.1)
     xml-simple (1.1.8)
     xpath (3.2.0)
       nokogiri (~> 1.8)
@@ -476,6 +476,6 @@ DEPENDENCIES
   web-console (>= 3.3.0)
   webmock (~> 3.13.0)
   will_paginate (~> 3.3.0)
-  xapian-full-alaveteli (~> 1.4.11.1)
+  xapian-full-alaveteli (~> 1.4.18.1)
   xml-simple (~> 1.1.8)
   zip_tricks (~> 5.6.0)
diff --git a/Gemfile.rails_next.lock b/Gemfile.rails_next.lock
@@ -45,65 +45,65 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.0.3.7)
-      actionpack (= 6.0.3.7)
+    actioncable (6.0.4)
+      actionpack (= 6.0.4)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.0.3.7)
-      actionpack (= 6.0.3.7)
-      activejob (= 6.0.3.7)
-      activerecord (= 6.0.3.7)
-      activestorage (= 6.0.3.7)
-      activesupport (= 6.0.3.7)
+    actionmailbox (6.0.4)
+      actionpack (= 6.0.4)
+      activejob (= 6.0.4)
+      activerecord (= 6.0.4)
+      activestorage (= 6.0.4)
+      activesupport (= 6.0.4)
       mail (>= 2.7.1)
-    actionmailer (6.0.3.7)
-      actionpack (= 6.0.3.7)
-      actionview (= 6.0.3.7)
-      activejob (= 6.0.3.7)
+    actionmailer (6.0.4)
+      actionpack (= 6.0.4)
+      actionview (= 6.0.4)
+      activejob (= 6.0.4)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.0.3.7)
-      actionview (= 6.0.3.7)
-      activesupport (= 6.0.3.7)
+    actionpack (6.0.4)
+      actionview (= 6.0.4)
+      activesupport (= 6.0.4)
       rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.0.3.7)
-      actionpack (= 6.0.3.7)
-      activerecord (= 6.0.3.7)
-      activestorage (= 6.0.3.7)
-      activesupport (= 6.0.3.7)
+    actiontext (6.0.4)
+      actionpack (= 6.0.4)
+      activerecord (= 6.0.4)
+      activestorage (= 6.0.4)
+      activesupport (= 6.0.4)
       nokogiri (>= 1.8.5)
-    actionview (6.0.3.7)
-      activesupport (= 6.0.3.7)
+    actionview (6.0.4)
+      activesupport (= 6.0.4)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
     active_model_otp (2.2.0)
       activemodel
       rotp (~> 6.2.0)
-    activejob (6.0.3.7)
-      activesupport (= 6.0.3.7)
+    activejob (6.0.4)
+      activesupport (= 6.0.4)
       globalid (>= 0.3.6)
-    activemodel (6.0.3.7)
-      activesupport (= 6.0.3.7)
-    activerecord (6.0.3.7)
-      activemodel (= 6.0.3.7)
-      activesupport (= 6.0.3.7)
-    activestorage (6.0.3.7)
-      actionpack (= 6.0.3.7)
-      activejob (= 6.0.3.7)
-      activerecord (= 6.0.3.7)
+    activemodel (6.0.4)
+      activesupport (= 6.0.4)
+    activerecord (6.0.4)
+      activemodel (= 6.0.4)
+      activesupport (= 6.0.4)
+    activestorage (6.0.4)
+      actionpack (= 6.0.4)
+      activejob (= 6.0.4)
+      activerecord (= 6.0.4)
       marcel (~> 1.0.0)
-    activesupport (6.0.3.7)
+    activesupport (6.0.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
       zeitwerk (~> 2.2, >= 2.2.2)
-    addressable (2.7.0)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     annotate (3.1.0)
       activerecord (>= 3.2, < 7.0)
@@ -135,7 +135,7 @@ GEM
       xpath (~> 3.2)
     charlock_holmes (0.7.7)
     coderay (1.1.2)
-    concurrent-ruby (1.1.8)
+    concurrent-ruby (1.1.9)
     crack (0.4.5)
       rexml
     crass (1.0.6)
@@ -161,10 +161,10 @@ GEM
     fast_gettext (2.0.2)
     ffi (1.15.0)
     fivemat (1.3.7)
-    flipper (0.17.2)
-    flipper-active_record (0.17.2)
-      activerecord (>= 4.2, < 7)
-      flipper (~> 0.17.2)
+    flipper (0.21.0)
+    flipper-active_record (0.21.0)
+      activerecord (>= 5.0, < 7)
+      flipper (~> 0.21.0)
     gender_detector (2.0.0)
     gettext (3.2.9)
       locale (>= 2.0.5)
@@ -173,7 +173,7 @@ GEM
       fast_gettext (>= 0.9.0)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    globalize (5.3.0)
+    globalize (5.3.1)
       activemodel (>= 4.2, < 6.1)
       activerecord (>= 4.2, < 6.1)
       request_store (~> 1.0)
@@ -204,7 +204,7 @@ GEM
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     locale (2.1.3)
-    loofah (2.9.1)
+    loofah (2.10.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mahoro (0.5)
@@ -257,20 +257,20 @@ GEM
       rack (>= 1.0, < 3)
     rack-utf8_sanitizer (1.7.0)
       rack (>= 1.0, < 3.0)
-    rails (6.0.3.7)
-      actioncable (= 6.0.3.7)
-      actionmailbox (= 6.0.3.7)
-      actionmailer (= 6.0.3.7)
-      actionpack (= 6.0.3.7)
-      actiontext (= 6.0.3.7)
-      actionview (= 6.0.3.7)
-      activejob (= 6.0.3.7)
-      activemodel (= 6.0.3.7)
-      activerecord (= 6.0.3.7)
-      activestorage (= 6.0.3.7)
-      activesupport (= 6.0.3.7)
+    rails (6.0.4)
+      actioncable (= 6.0.4)
+      actionmailbox (= 6.0.4)
+      actionmailer (= 6.0.4)
+      actionpack (= 6.0.4)
+      actiontext (= 6.0.4)
+      actionview (= 6.0.4)
+      activejob (= 6.0.4)
+      activemodel (= 6.0.4)
+      activerecord (= 6.0.4)
+      activestorage (= 6.0.4)
+      activesupport (= 6.0.4)
       bundler (>= 1.3.0)
-      railties (= 6.0.3.7)
+      railties (= 6.0.4)
       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
@@ -284,9 +284,9 @@ GEM
     rails-i18n (6.0.0)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 7)
-    railties (6.0.3.7)
-      actionpack (= 6.0.3.7)
-      activesupport (= 6.0.3.7)
+    railties (6.0.4)
+      actionpack (= 6.0.4)
+      activesupport (= 6.0.4)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.20.3, < 2.0)
@@ -394,11 +394,11 @@ GEM
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    websocket-driver (0.7.3)
+    websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     will_paginate (3.3.0)
-    xapian-full-alaveteli (1.4.11.1)
+    xapian-full-alaveteli (1.4.18.1)
     xml-simple (1.1.8)
     xpath (3.2.0)
       nokogiri (~> 1.8)
@@ -475,7 +475,7 @@ DEPENDENCIES
   rubocop-rails
   ruby-msg (~> 1.5.0)!
   rubyzip (~> 1.3.0, < 2.0.0)
-  sass-rails (~> 5.0.7)
+  sass-rails (~> 5.0.8)
   secure_headers (~> 6.3.2)
   simplecov (~> 0.17.1)
   simplecov-lcov (~> 0.7.0)
@@ -492,6 +492,6 @@ DEPENDENCIES
   web-console (>= 3.3.0)
   webmock (~> 3.13.0)
   will_paginate (~> 3.3.0)
-  xapian-full-alaveteli (~> 1.4.11.1)
+  xapian-full-alaveteli (~> 1.4.18.1)
   xml-simple (~> 1.1.8)
   zip_tricks (~> 5.6.0)
diff --git a/app/assets/javascripts/wizard.js b/app/assets/javascripts/wizard.js
@@ -244,8 +244,8 @@
         .addClass(wizard.options.nextStepSuggestedClass);
     });
 
-    wizard.$actions.find('input.' + wizard.options.questionOptionClass + '[name^="refusal_advice"]').val(false);
-    $suggestions.find('input.' + wizard.options.questionOptionClass + '[name^="refusal_advice"]').val(true);
+    wizard.$actions.find('input[name^="refusal_advice"]').val(false);
+    $suggestions.find('input[name^="refusal_advice"]').val(true);
   };
 
   RefusalWizard.prototype._resetQuestion = function($question) {
@@ -329,10 +329,10 @@
     // fetch translated strings from the HTML
     var textExpand = $('.wizard').data('expand-button-text-expand');
     var textShrink = $('.wizard').data('expand-button-text-shrink');
-    
+
     // Hide the long list now we're sure we've got JS
     $('[data-block="exemption"]').toggleClass('expanded');
-   
+
     if ($('.maximise-questions').text() == textExpand ) {
       $('.maximise-questions').html(textShrink);
     } else {
@@ -344,7 +344,7 @@
   if(shouldHideCheckboxes()) {
 
     $('[data-block="exemption"] fieldset').after("<button class='button-secondary maximise-questions'>" + $('.wizard').data('expand-button-text-expand') + "</button>");
-    
+
     //if a checkbox is pre-selected, expand the list
     if ($('[data-block="exemption"] input[type="checkbox"]').is(":checked")) {
       expandFieldset();
@@ -355,6 +355,6 @@
     e.preventDefault();
     expandFieldset();
   });
-  
+
 
 })(window.jQuery);
diff --git a/app/controllers/admin_censor_rule_controller.rb b/app/controllers/admin_censor_rule_controller.rb
@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 # app/controllers/admin_censor_rule_controller.rb:
 # For modifying requests.
 #

diff --git a/app/controllers/admin_comment_controller.rb b/app/controllers/admin_comment_controller.rb
@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 # app/controllers/admin_comment_controller.rb:
 # Controller for editing comments from the admin interface.
 #

diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 # controllers/admin.rb:
 # All admin controllers are dervied from this.
 #

diff --git a/app/controllers/admin_general_controller.rb b/app/controllers/admin_general_controller.rb
@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 # app/controllers/admin_controller.rb:
 # Controller for main admin pages.
 #

diff --git a/app/controllers/admin_holiday_imports_controller.rb b/app/controllers/admin_holiday_imports_controller.rb
@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 class AdminHolidayImportsController < AdminController
 
   def new

diff --git a/app/controllers/admin_holidays_controller.rb b/app/controllers/admin_holidays_controller.rb
@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 class AdminHolidaysController < AdminController
 
   before_action :set_holiday, :only => [:edit, :update, :destroy]

diff --git a/app/controllers/admin_incoming_message_controller.rb b/app/controllers/admin_incoming_message_controller.rb
@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 class AdminIncomingMessageController < AdminController
 
   before_action :set_incoming_message, :only => [:edit, :update, :destroy, :redeliver]

diff --git a/app/controllers/admin_info_request_event_controller.rb b/app/controllers/admin_info_request_event_controller.rb
@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 # app/controllers/admin_info_request_event_controller.rb:
 # Controller for FOI request event manipulation from the admin interface.
 #

diff --git a/app/controllers/admin_outgoing_message_controller.rb b/app/controllers/admin_outgoing_message_controller.rb
@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 class AdminOutgoingMessageController < AdminController
 
   before_action :set_outgoing_message, :only => [:edit, :destroy, :update, :resend]

diff --git a/app/controllers/admin_public_body_categories_controller.rb b/app/controllers/admin_public_body_categories_controller.rb
@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 class AdminPublicBodyCategoriesController < AdminController
 
   include TranslatableParams

diff --git a/app/controllers/admin_public_body_change_requests_controller.rb b/app/controllers/admin_public_body_change_requests_controller.rb
@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 class AdminPublicBodyChangeRequestsController < AdminController
   before_action :set_change_request, only: [:edit, :update]
 

diff --git a/app/controllers/admin_public_body_controller.rb b/app/controllers/admin_public_body_controller.rb
@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 # app/controllers/admin_public_body_controller.rb:
 # Controller for editing public bodies from the admin interface.
 #

diff --git a/app/controllers/admin_public_body_headings_controller.rb b/app/controllers/admin_public_body_headings_controller.rb
@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 class AdminPublicBodyHeadingsController < AdminController
 
   include TranslatableParams

diff --git a/app/controllers/admin_raw_email_controller.rb b/app/controllers/admin_raw_email_controller.rb
@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 # app/controllers/admin_raw_email_controller.rb:
 # Controller for managing raw emails from the admin interface.
 #

diff --git a/app/controllers/admin_request_controller.rb b/app/controllers/admin_request_controller.rb
@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 # app/controllers/admin_request_controller.rb:
 # Controller for viewing FOI requests from the admin interface.
 #

diff --git a/app/controllers/admin_spam_addresses_controller.rb b/app/controllers/admin_spam_addresses_controller.rb
@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 class AdminSpamAddressesController < AdminController
 
   before_action :set_spam_address, :only => [:destroy]