Merge branch 'release/0.40.0.0'

mysociety · Nov 16, 2021 · 020681c · 020681c
2 parents e2219a5 + c78582c
commit 020681c
Show file tree

Hide file tree

Showing 539 changed files with 14,295 additions and 3,406 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -7,87 +7,6 @@ updates:
     open-pull-requests-limit: 99
     rebase-strategy: "disabled"
     ignore:
-      # requires Ruby >= 2.4.0
-      - dependency-name: annotate
-        versions:
-        - ">= 3.1.1"
-      - dependency-name: capybara
-        versions:
-        - ">= 3.16.0"
-      - dependency-name: icalendar
-        versions:
-        - ">= 2.6.0"
-      - dependency-name: launchy
-        versions:
-        - ">= 2.5.0"
-      - dependency-name: listen
-        versions:
-        - ">= 3.5.1"
-      - dependency-name: maxmind-db
-        versions:
-        - ">= 1.1.0"
-      - dependency-name: pry-byebug
-        versions:
-        - ">= 3.8.0"
-      - dependency-name: recaptcha
-        versions:
-        - ">= 5.7.0"
-      - dependency-name: rubocop
-        versions:
-        - ">= 0.82.0"
-      - dependency-name: rubocop-performance
-        versions:
-        - ">= 1.6.0"
-      - dependency-name: sass-rails
-        versions:
-        - ">= 5.0.8"
-      - dependency-name: simplecov
-        versions:
-        - ">= 0.18.0"
-
-      # pry-byebug requires Ruby >= 2.4.0
-      - dependency-name: pry
-        versions:
-        - ">= 0.13.0"
-
-      # simplecov requires Ruby >= 2.4.0
-      - dependency-name: simplecov-lcov
-        versions:
-        - ">= 0.8.0"
-
-      # requires Ruby >= 2.4
-      - dependency-name: rubyzip
-        versions:
-        - ">= 2.0.0"
-
-      # requires Ruby ~> 2.4
-      - dependency-name: holidays
-        versions:
-        - ">= 8.0.0"
-
-      # requires Ruby >= 2.4.6
-      - dependency-name: globalize
-        versions:
-        - ">= 5.3.0"
-
-      # requires Ruby >= 2.5.0
-      - dependency-name: capybara
-        versions:
-        - ">= 3.33.0"
-      - dependency-name: rolify
-        versions:
-        - ">= 6.0.0"
-
-      # factory_bot requires Ruby >= 2.5.0
-      - dependency-name: factory_bot_rails
-        versions:
-        - ">= 6.0.0"
-
-      # sprockets requires Ruby >= 2.5.0
-      - 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:

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -49,7 +49,7 @@ jobs:
       run: |
         sudo apt-get -y update
         sudo apt-get -y install exim4-daemon-light
-        sudo apt-get -y install `cut -d " " -f 1 config/packages.ubuntu-bionic | egrep -v "(^#|wkhtml|bundler|^ruby|^rake)"`
+        sudo apt-get -y install `cut -d " " -f 1 config/packages.ubuntu-focal | egrep -v "(^#|wkhtml|bundler|^ruby|^rake)"`
 
     - name: Install Ruby ${{ matrix.ruby }}
       uses: ruby/setup-ruby@v1

diff --git a/.github/workflows/rubocop.yml b/.github/workflows/rubocop.yml
@@ -17,6 +17,6 @@ jobs:
       uses: reviewdog/action-rubocop@v1
       with:
         github_token: ${{ secrets.github_token }}
-        rubocop_version: 0.81.0
-        rubocop_extensions: rubocop-performance:1.5.2 rubocop-rails:2.5.2
+        rubocop_version: gemfile
+        rubocop_extensions: rubocop-performance:gemfile rubocop-rails:gemfile
         level: warning