From 223b77a83126079fa9e193c3b48dd39540ec4937 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Nov 2021 04:02:10 +0000 Subject: [PATCH 001/389] Bump stripe from 5.39.0 to 5.40.0 Bumps [stripe](https://github.com/stripe/stripe-ruby) from 5.39.0 to 5.40.0. - [Release notes](https://github.com/stripe/stripe-ruby/releases) - [Changelog](https://github.com/stripe/stripe-ruby/blob/master/CHANGELOG.md) - [Commits](https://github.com/stripe/stripe-ruby/compare/v5.39.0...v5.40.0) --- updated-dependencies: - dependency-name: stripe dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Gemfile | 2 +- Gemfile.lock | 4 ++-- Gemfile.rails_next.lock | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index a5f359a896..fc4612bab1 100644 --- a/Gemfile +++ b/Gemfile @@ -120,7 +120,7 @@ gem 'rubyzip', '~> 2.3.2' gem 'secure_headers', '~> 6.3.3' gem 'statistics2', '~> 0.54' gem 'strip_attributes', :git => 'https://github.com/mysociety/strip_attributes.git', :branch => 'globalize3-rails5.2' -gem 'stripe', '~> 5.39.0' +gem 'stripe', '~> 5.40.0' gem 'syslog_protocol', '~> 0.9.0' gem 'thin', '~> 1.8.1' gem 'vpim', '~> 13.11.11' diff --git a/Gemfile.lock b/Gemfile.lock index 4473e2e871..a362960d5d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -366,7 +366,7 @@ GEM activesupport (>= 4.0) sprockets (>= 3.0.0) statistics2 (0.54) - stripe (5.39.0) + stripe (5.40.0) syslog_protocol (0.9.2) text (1.3.1) thin (1.8.1) @@ -479,7 +479,7 @@ DEPENDENCIES simplecov-lcov (~> 0.7.0) statistics2 (~> 0.54) strip_attributes! - stripe (~> 5.39.0) + stripe (~> 5.40.0) stripe-ruby-mock! syslog_protocol (~> 0.9.0) thin (~> 1.8.1) diff --git a/Gemfile.rails_next.lock b/Gemfile.rails_next.lock index 75c402a0b6..6b051032a1 100644 --- a/Gemfile.rails_next.lock +++ b/Gemfile.rails_next.lock @@ -370,7 +370,7 @@ GEM activesupport (>= 4.0) sprockets (>= 3.0.0) statistics2 (0.54) - stripe (5.39.0) + stripe (5.40.0) syslog_protocol (0.9.2) text (1.3.1) thin (1.8.1) @@ -482,7 +482,7 @@ DEPENDENCIES simplecov-lcov (~> 0.7.0) statistics2 (~> 0.54) strip_attributes! - stripe (~> 5.39.0) + stripe (~> 5.40.0) stripe-ruby-mock! syslog_protocol (~> 0.9.0) thin (~> 1.8.1) From fd2368dd0b02cc061610541c36fd9ef024b2676b Mon Sep 17 00:00:00 2001 From: Graeme Porteous Date: Thu, 23 Sep 2021 17:35:52 +0100 Subject: [PATCH 002/389] Drop support for Ruby 2.5 --- .github/workflows/ci.yml | 1 - .ruby-style.yml | 2 +- .ruby-version.example | 2 +- README.md | 3 +-- doc/CHANGES.md | 6 ++++++ lib/tasks/config_files.rake | 4 ++-- 6 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 84b17f151d..14edbd5e3e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,7 +14,6 @@ jobs: fail-fast: false matrix: include: - - { ruby: 2.5 } - { ruby: 2.6 } - { ruby: 2.7 } - { ruby: 2.7, gemfile: 'Gemfile.rails_next' } diff --git a/.ruby-style.yml b/.ruby-style.yml index 639c80ca83..b78fb32a64 100644 --- a/.ruby-style.yml +++ b/.ruby-style.yml @@ -4,7 +4,7 @@ require: - rubocop-rails AllCops: - TargetRubyVersion: 2.5 + TargetRubyVersion: 2.6 RubyInterpreters: - ruby - rake diff --git a/.ruby-version.example b/.ruby-version.example index ecd7ee50cb..743af5e125 100644 --- a/.ruby-version.example +++ b/.ruby-version.example @@ -1 +1 @@ -2.5.8 +2.6.8 diff --git a/README.md b/README.md index ab3a9806a6..f85c51884c 100644 --- a/README.md +++ b/README.md @@ -37,11 +37,10 @@ see [the project website](http://alaveteli.org) for instructions on installing A Every Alaveteli commit is tested by GitHub Actions on the [following Ruby platforms](https://github.com/mysociety/alaveteli/blob/develop/.github/workflows/ci.yml#L15) -* ruby-2.5 * ruby-2.6 * ruby-2.7 -If you use a ruby version management tool (such as RVM or .rbenv) and want to use the default development version used by the Alaveteli team (currently 2.5.8), you can create a `.ruby-version` symlink with a target of `.ruby-version.example` to switch to that automatically in the project directory. +If you use a ruby version management tool (such as RVM or .rbenv) and want to use the default development version used by the Alaveteli team (currently 2.6.8), you can create a `.ruby-version` symlink with a target of `.ruby-version.example` to switch to that automatically in the project directory. ## How to contribute diff --git a/doc/CHANGES.md b/doc/CHANGES.md index 16538933bc..fa72d07e6f 100644 --- a/doc/CHANGES.md +++ b/doc/CHANGES.md @@ -1,3 +1,9 @@ +# develop + +## Highlighted Features + +* Drop support for Ruby 2.5 (Graeme Porteous) + # 0.40.0.0 ## Highlighted Features diff --git a/lib/tasks/config_files.rake b/lib/tasks/config_files.rake index d5dbcdb60f..157e7a8869 100644 --- a/lib/tasks/config_files.rake +++ b/lib/tasks/config_files.rake @@ -80,7 +80,7 @@ namespace :config_files do 'VCSPATH=alaveteli ' \ 'SITE=alaveteli ' \ 'SCRIPT_FILE=config/alert-tracks-debian.example ' \ - 'RUBY_VERSION=2.5.8 ' \ + 'RUBY_VERSION=2.6.8 ' \ 'USE_RBENV=false ' check_for_env_vars(['DEPLOY_USER', 'VHOST_DIR', @@ -125,7 +125,7 @@ namespace :config_files do 'VHOST_DIR=/dir/above/alaveteli VCSPATH=alaveteli ' \ 'SITE=alaveteli CRONTAB=config/crontab-example ' \ 'MAILTO=cron-alaveteli@example.org ' \ - 'RUBY_VERSION=2.5.8 ' + 'RUBY_VERSION=2.6.8 ' 'USE_RBENV=false ' check_for_env_vars(['DEPLOY_USER', 'VHOST_DIR', From ad27f8e683e5108e316cb870567742470c266d4e Mon Sep 17 00:00:00 2001 From: Graeme Porteous Date: Mon, 15 Nov 2021 11:52:14 +0000 Subject: [PATCH 003/389] Drop support for Ruby 2.6 --- .github/workflows/ci.yml | 1 - .ruby-style.yml | 2 +- .ruby-version.example | 2 +- README.md | 3 +-- doc/CHANGES.md | 1 + lib/tasks/config_files.rake | 4 ++-- 6 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 14edbd5e3e..cdaf5d8169 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,7 +14,6 @@ jobs: fail-fast: false matrix: include: - - { ruby: 2.6 } - { ruby: 2.7 } - { ruby: 2.7, gemfile: 'Gemfile.rails_next' } diff --git a/.ruby-style.yml b/.ruby-style.yml index b78fb32a64..12e5bdddd1 100644 --- a/.ruby-style.yml +++ b/.ruby-style.yml @@ -4,7 +4,7 @@ require: - rubocop-rails AllCops: - TargetRubyVersion: 2.6 + TargetRubyVersion: 2.7 RubyInterpreters: - ruby - rake diff --git a/.ruby-version.example b/.ruby-version.example index 743af5e125..a4dd9dba4f 100644 --- a/.ruby-version.example +++ b/.ruby-version.example @@ -1 +1 @@ -2.6.8 +2.7.4 diff --git a/README.md b/README.md index f85c51884c..9fe4a3ecbd 100644 --- a/README.md +++ b/README.md @@ -37,10 +37,9 @@ see [the project website](http://alaveteli.org) for instructions on installing A Every Alaveteli commit is tested by GitHub Actions on the [following Ruby platforms](https://github.com/mysociety/alaveteli/blob/develop/.github/workflows/ci.yml#L15) -* ruby-2.6 * ruby-2.7 -If you use a ruby version management tool (such as RVM or .rbenv) and want to use the default development version used by the Alaveteli team (currently 2.6.8), you can create a `.ruby-version` symlink with a target of `.ruby-version.example` to switch to that automatically in the project directory. +If you use a ruby version management tool (such as RVM or .rbenv) and want to use the default development version used by the Alaveteli team (currently 2.7.4), you can create a `.ruby-version` symlink with a target of `.ruby-version.example` to switch to that automatically in the project directory. ## How to contribute diff --git a/doc/CHANGES.md b/doc/CHANGES.md index fa72d07e6f..7d85c22801 100644 --- a/doc/CHANGES.md +++ b/doc/CHANGES.md @@ -3,6 +3,7 @@ ## Highlighted Features * Drop support for Ruby 2.5 (Graeme Porteous) +* Drop support for Ruby 2.6 (Graeme Porteous) # 0.40.0.0 diff --git a/lib/tasks/config_files.rake b/lib/tasks/config_files.rake index 157e7a8869..b7af371d3b 100644 --- a/lib/tasks/config_files.rake +++ b/lib/tasks/config_files.rake @@ -80,7 +80,7 @@ namespace :config_files do 'VCSPATH=alaveteli ' \ 'SITE=alaveteli ' \ 'SCRIPT_FILE=config/alert-tracks-debian.example ' \ - 'RUBY_VERSION=2.6.8 ' \ + 'RUBY_VERSION=2.7.4 ' \ 'USE_RBENV=false ' check_for_env_vars(['DEPLOY_USER', 'VHOST_DIR', @@ -125,7 +125,7 @@ namespace :config_files do 'VHOST_DIR=/dir/above/alaveteli VCSPATH=alaveteli ' \ 'SITE=alaveteli CRONTAB=config/crontab-example ' \ 'MAILTO=cron-alaveteli@example.org ' \ - 'RUBY_VERSION=2.6.8 ' + 'RUBY_VERSION=2.7.4 ' 'USE_RBENV=false ' check_for_env_vars(['DEPLOY_USER', 'VHOST_DIR', From f1ecea7ca9987b5d584b2f0436d4c8c309bfe736 Mon Sep 17 00:00:00 2001 From: Graeme Porteous Date: Mon, 15 Nov 2021 11:54:53 +0000 Subject: [PATCH 004/389] Drop support for Debian 9 Stretch --- .vagrant.yml.example | 2 +- Vagrantfile | 6 +----- bin/vagrant-stretch | 2 -- doc/CHANGES.md | 1 + docker/Dockerfile | 2 +- 5 files changed, 4 insertions(+), 9 deletions(-) delete mode 100755 bin/vagrant-stretch diff --git a/.vagrant.yml.example b/.vagrant.yml.example index 368b96250a..3dc82adfc1 100644 --- a/.vagrant.yml.example +++ b/.vagrant.yml.example @@ -4,7 +4,7 @@ ip: 10.10.10.30 public_network: false memory: 1536 themes_dir: ../alaveteli-themes -os: stretch64 +os: buster64 use_nfs: false show_settings: false # By default CPU count is calculated dynamically diff --git a/Vagrantfile b/Vagrantfile index 02b04fe5ec..9f064196fe 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -102,7 +102,7 @@ DEFAULTS = { 'public_network' => false, 'memory' => 1536, 'themes_dir' => '../alaveteli-themes', - 'os' => 'stretch64', + 'os' => 'buster64', 'name' => 'default', 'use_nfs' => false, 'show_settings' => false, @@ -132,10 +132,6 @@ SUPPORTED_OPERATING_SYSTEMS = { box: 'ubuntu/focal64', box_url: 'https://app.vagrantup.com/ubuntu/boxes/focal64' }, - 'stretch64' => { - box: 'debian/stretch64', - box_url: 'https://app.vagrantup.com/debian/boxes/stretch64' - }, 'buster64' => { box: 'debian/buster64', box_url: 'https://app.vagrantup.com/debian/boxes/buster64' diff --git a/bin/vagrant-stretch b/bin/vagrant-stretch deleted file mode 100755 index ef3597bdd8..0000000000 --- a/bin/vagrant-stretch +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -ALAVETELI_VAGRANT_NAME=stretch ALAVETELI_VAGRANT_OS=stretch64 exec vagrant "$@" diff --git a/doc/CHANGES.md b/doc/CHANGES.md index 7d85c22801..947757f379 100644 --- a/doc/CHANGES.md +++ b/doc/CHANGES.md @@ -4,6 +4,7 @@ * Drop support for Ruby 2.5 (Graeme Porteous) * Drop support for Ruby 2.6 (Graeme Porteous) +* Drop support for Debian 9 Stretch (Graeme Porteous) # 0.40.0.0 diff --git a/docker/Dockerfile b/docker/Dockerfile index 96aadfa6d2..95c4993467 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:2.6-stretch +FROM ruby:2.6-buster ENV DOCKER 1 ENV DEBIAN_FRONTEND noninteractive From d3d785633f72a8336b56e44bf17d053706a2cee8 Mon Sep 17 00:00:00 2001 From: Graeme Porteous Date: Mon, 15 Nov 2021 11:57:15 +0000 Subject: [PATCH 005/389] Drop support for Debian 10 Buster --- .vagrant.yml.example | 2 +- Vagrantfile | 6 +----- bin/vagrant-buster | 2 -- doc/CHANGES.md | 1 + docker/Dockerfile | 2 +- 5 files changed, 4 insertions(+), 9 deletions(-) delete mode 100755 bin/vagrant-buster diff --git a/.vagrant.yml.example b/.vagrant.yml.example index 3dc82adfc1..2e9751df20 100644 --- a/.vagrant.yml.example +++ b/.vagrant.yml.example @@ -4,7 +4,7 @@ ip: 10.10.10.30 public_network: false memory: 1536 themes_dir: ../alaveteli-themes -os: buster64 +os: bullseye64 use_nfs: false show_settings: false # By default CPU count is calculated dynamically diff --git a/Vagrantfile b/Vagrantfile index 9f064196fe..c5868c2e35 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -102,7 +102,7 @@ DEFAULTS = { 'public_network' => false, 'memory' => 1536, 'themes_dir' => '../alaveteli-themes', - 'os' => 'buster64', + 'os' => 'bullseye64', 'name' => 'default', 'use_nfs' => false, 'show_settings' => false, @@ -132,10 +132,6 @@ SUPPORTED_OPERATING_SYSTEMS = { box: 'ubuntu/focal64', box_url: 'https://app.vagrantup.com/ubuntu/boxes/focal64' }, - 'buster64' => { - box: 'debian/buster64', - box_url: 'https://app.vagrantup.com/debian/boxes/buster64' - }, 'bullseye64' => { box: 'debian/bullseye64', box_url: 'https://app.vagrantup.com/debian/boxes/bullseye64' diff --git a/bin/vagrant-buster b/bin/vagrant-buster deleted file mode 100755 index b0f47b98c3..0000000000 --- a/bin/vagrant-buster +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -ALAVETELI_VAGRANT_NAME=buster ALAVETELI_VAGRANT_OS=buster64 exec vagrant "$@" diff --git a/doc/CHANGES.md b/doc/CHANGES.md index 947757f379..29e8953319 100644 --- a/doc/CHANGES.md +++ b/doc/CHANGES.md @@ -5,6 +5,7 @@ * Drop support for Ruby 2.5 (Graeme Porteous) * Drop support for Ruby 2.6 (Graeme Porteous) * Drop support for Debian 9 Stretch (Graeme Porteous) +* Drop support for Debian 10 Buster (Graeme Porteous) # 0.40.0.0 diff --git a/docker/Dockerfile b/docker/Dockerfile index 95c4993467..427a0da20e 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:2.6-buster +FROM ruby:2.6-bullseye ENV DOCKER 1 ENV DEBIAN_FRONTEND noninteractive From 79d7f382a397705d54eee7c21e4cf5da1523886c Mon Sep 17 00:00:00 2001 From: Graeme Porteous Date: Mon, 15 Nov 2021 11:59:48 +0000 Subject: [PATCH 006/389] Drop support for Ubuntu 18.04 Bionic --- Vagrantfile | 4 ---- bin/vagrant-bionic | 2 -- config/packages.ubuntu-bionic | 35 --------------------------------- doc/CHANGES.md | 1 + script/site-specific-install.sh | 23 ---------------------- 5 files changed, 1 insertion(+), 64 deletions(-) delete mode 100755 bin/vagrant-bionic delete mode 100644 config/packages.ubuntu-bionic diff --git a/Vagrantfile b/Vagrantfile index c5868c2e35..401d8ec794 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -124,10 +124,6 @@ else end SUPPORTED_OPERATING_SYSTEMS = { - 'bionic64' => { - box: 'ubuntu/bionic64', - box_url: 'https://app.vagrantup.com/ubuntu/boxes/bionic64' - }, 'focal64' => { box: 'ubuntu/focal64', box_url: 'https://app.vagrantup.com/ubuntu/boxes/focal64' diff --git a/bin/vagrant-bionic b/bin/vagrant-bionic deleted file mode 100755 index 294b4cac59..0000000000 --- a/bin/vagrant-bionic +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -ALAVETELI_VAGRANT_NAME=bionic ALAVETELI_VAGRANT_OS=bionic64 exec vagrant "$@" diff --git a/config/packages.ubuntu-bionic b/config/packages.ubuntu-bionic deleted file mode 100644 index 3d110d05da..0000000000 --- a/config/packages.ubuntu-bionic +++ /dev/null @@ -1,35 +0,0 @@ -build-essential -bundler -catdoc -elinks -gettext -ghostscript -gnuplot-nox -imagemagick -libicu-dev -libmagic-dev -libmagickwand-dev -libpq-dev -libsqlite3-dev -libxml2-dev -libxslt-dev -links -lockfile-progs -memcached -mutt -pdftk-java -poppler-utils -postgresql -postgresql-client -rake -ruby -ruby-dev -sqlite3 -tnef -ttf-bitstream-vera -unrtf -unzip -uuid-dev -wkhtmltox -wv -xapian-tools diff --git a/doc/CHANGES.md b/doc/CHANGES.md index 29e8953319..dbeca4283c 100644 --- a/doc/CHANGES.md +++ b/doc/CHANGES.md @@ -6,6 +6,7 @@ * Drop support for Ruby 2.6 (Graeme Porteous) * Drop support for Debian 9 Stretch (Graeme Porteous) * Drop support for Debian 10 Buster (Graeme Porteous) +* Drop support for Ubuntu 19.04 Bionic (Graeme Porteous) # 0.40.0.0 diff --git a/script/site-specific-install.sh b/script/site-specific-install.sh index dc56313af9..9a45617090 100755 --- a/script/site-specific-install.sh +++ b/script/site-specific-install.sh @@ -65,29 +65,6 @@ install_daemon() { update_mysociety_apt_sources -# Ubuntu Bionic Fixes -if [ x"$DISTRIBUTION" = x"ubuntu" ] && [ x"$DISTVERSION" = x"bionic" ] -then - # Remove old cosmic repo that's no longer available - rm --force /etc/apt/sources.list.d/ubuntu-cosmic.list - - # Add focal repo to get pdftk-java - cat > /etc/apt/sources.list.d/ubuntu-focal.list < /etc/apt/preferences.d/ubuntu-focal.pref < Date: Tue, 23 Nov 2021 14:29:32 +0000 Subject: [PATCH 007/389] Add admin-navbar id to admin nav Makes it easier to remove via the web inspector to print admin pages out for information releases. --- app/views/admin_general/_admin_navbar.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/admin_general/_admin_navbar.html.erb b/app/views/admin_general/_admin_navbar.html.erb index 4732713a87..4ec89358a2 100644 --- a/app/views/admin_general/_admin_navbar.html.erb +++ b/app/views/admin_general/_admin_navbar.html.erb @@ -1,5 +1,5 @@
-
+