Merge pull request #161 from democrateam/release_2.1.1

Upgrade CONSUL DEMOCRACY to version 2.1.1

.codeclimate.yml

@@ -1,7 +1,7 @@
 engines:
   rubocop:
     enabled: true
-    channel: rubocop-1-31-0
+    channel: rubocop-1-56-3
   duplication:
     enabled: true
     config:

.github/workflows/db_schema.yml

@@ -25,7 +25,7 @@ jobs:
       PGUSER: consul
       POSTGRES_HOST: postgres
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
           bundler-cache: true

.github/workflows/docker.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Set up Docker Buildx
         id: buildx

.github/workflows/linters.yml

@@ -6,7 +6,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - run: |
           git fetch --no-tags --prune origin +refs/heads/*:refs/remotes/origin/*
       - name: Setup Ruby

.github/workflows/tests.yml

@@ -35,12 +35,12 @@ jobs:
         ci_node_total: [5]
         ci_node_index: [0, 1, 2, 3, 4]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
           bundler-cache: true
       - name: Setup NPM
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           cache: "npm"
           node-version-file: ".node-version"
@@ -66,7 +66,7 @@ jobs:
           parallel: true
       - name: Upload screenshots
         if: failure()
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: screenshots
           path: tmp/screenshots

.rubocop.yml

@@ -22,12 +22,14 @@ Bundler/OrderedGems:
 
 Capybara/ClickLinkOrButtonStyle:
   Enabled: true
+  EnforcedStyle: strict
 
 Capybara/CurrentPathExpectation:
   Enabled: true
 
 Capybara/NegationMatcher:
   Enabled: true
+  EnforcedStyle: not_to
 
 Capybara/RSpec/HaveSelector:
   Enabled: true
@@ -375,6 +377,9 @@ Rails/CreateTableWithTimestamps:
 Rails/Date:
   Enabled: true
 
+Rails/DeprecatedActiveModelErrorsMethods: # TODO: Remove after upgrading to Rails 7
+  Enabled: true
+
 Rails/DurationArithmetic:
   Enabled: true
 
@@ -505,6 +510,9 @@ Rails/Validation:
 Rails/WhereEquals:
   Enabled: true
 
+Rails/WhereMissing:
+  Enabled: true
+
 Rails/WhereNot:
   Enabled: true
 

CHANGELOG.md

@@ -2,6 +2,39 @@
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 
+## [2.1.1](https://github.com/consuldemocracy/consuldemocracy/tree/2.1.1) (2024-03-21)
+
+[Full Changelog](https://github.com/consuldemocracy/consuldemocracy/compare/2.1.0...2.1.1)
+
+### Changed
+
+- **Maintenance-CI:** Update setup-node action to version 4 [\#5419](https://github.com/consuldemocracy/consuldemocracy/pull/5419)
+- **Maintenance-CI:** Update upload artifact action to version 4 [\#5411](https://github.com/consuldemocracy/consuldemocracy/pull/5411) and [\#5420](https://github.com/consuldemocracy/consuldemocracy/pull/5420)
+- **Maintenance-CI:** Update checkout action to version 4 [\#5407](https://github.com/consuldemocracy/consuldemocracy/pull/5407) and [\#5415](https://github.com/consuldemocracy/consuldemocracy/pull/5415)
+- **Maintenance-Gems:** Bump rubocop-rspec from 2.24.1 to 2.27.0 [\#5405](https://github.com/consuldemocracy/consuldemocracy/pull/5405)
+- **Maintenance-Gems:** \[Security\] Bump rails from 6.1.7.6 to 6.1.7.7 [\#5401](https://github.com/consuldemocracy/consuldemocracy/pull/5401)
+- **Maintenance-Gems:** \[Security\] Bump view_component from 3.6.0 to 3.11.0 [\#5399](https://github.com/consuldemocracy/consuldemocracy/pull/5399) and [\#5432](https://github.com/consuldemocracy/consuldemocracy/pull/5432)
+- **Maintenance-Gems:** Bump rubocop-factory_bot from 2.24.0 to 2.25.1 [\#5385](https://github.com/consuldemocracy/consuldemocracy/pull/5385)
+- **Maintenance-Gems:** Bump rubocop-capybara from 2.19.0 to 2.20.0 [\#5383](https://github.com/consuldemocracy/consuldemocracy/pull/5383)
+- **Maintenance-Gems:** Bump capybara from 3.39.2 to 3.40.0 [\#5378](https://github.com/consuldemocracy/consuldemocracy/pull/5378)
+- **Maintenance-Gems:** Bump bullet from 7.0.7 to 7.1.6 [\#5374](https://github.com/consuldemocracy/consuldemocracy/pull/5374)
+- **Maintenance-Gems:** Bump faker from 3.2.1 to 3.2.3 [\#5373](https://github.com/consuldemocracy/consuldemocracy/pull/5373)
+- **Maintenance-Gems:** \[Security\] Bump puma from 5.6.7 to 5.6.8 [\#5365](https://github.com/consuldemocracy/consuldemocracy/pull/5365)
+- **Maintenance-Gems:** Bump rubocop-rails from 2.21.2 to 2.23.1 [\#5362](https://github.com/consuldemocracy/consuldemocracy/pull/5362)
+- **Maintenance-Gems:** Bump pdf-reader from 2.11.0 to 2.12.0 [\#5361](https://github.com/consuldemocracy/consuldemocracy/pull/5361)
+- **Maintenance-Gems:** Bump factory_bot_rails from 6.2.0 to 6.4.3 [\#5356](https://github.com/consuldemocracy/consuldemocracy/pull/5356)
+- **Maintenance-Gems:** Bump mdl from 0.12.0 to 0.13.0 [\#5290](https://github.com/consuldemocracy/consuldemocracy/pull/5290)
+- **Maintenance-Rubocop:** Add rubocop rules affecting Rails 6.1 [\#5421](https://github.com/consuldemocracy/consuldemocracy/pull/5421)
+
+### Fixed
+
+- **Accessibility:** Fix invalid HTML in comment votes [\#5426](https://github.com/consuldemocracy/consuldemocracy/pull/5426)
+- **Admin:** Allow whitespace between square brackets in GeoJSON polygons [\#5389](https://github.com/consuldemocracy/consuldemocracy/pull/5389)
+- **Maintenance-CI:** Update Code Climate Rubocop version [\#5431](https://github.com/consuldemocracy/consuldemocracy/pull/5431)
+- **Maintenance-Specs:** Prevent "Unable to autoload constant" error in tests [\#5422](https://github.com/consuldemocracy/consuldemocracy/pull/5422)
+- **Translations:** Add missing Spanish translations [\#5403](https://github.com/consuldemocracy/consuldemocracy/pull/5403)
+- **UX:** Fix link to debates help [\#5395](https://github.com/consuldemocracy/consuldemocracy/pull/5395)
+
 ## [2.1.0](https://github.com/consuldemocracy/consuldemocracy/tree/2.1.0) (2024-02-20)
 
 [Full Changelog](https://github.com/consuldemocracy/consuldemocracy/compare/2.0.1...2.1.0)

Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem "rails", "6.1.7.6"
+gem "rails", "6.1.7.7"
 
 gem "acts-as-taggable-on", "~> 9.0.1"
 gem "acts_as_votable", "~> 0.14.0"
@@ -44,7 +44,7 @@ gem "omniauth-twitter", "~> 1.4.0"
 gem "paranoia", "~> 2.6.2"
 gem "pg", "~> 1.4.3"
 gem "pg_search", "~> 2.3.6"
-gem "puma", "~> 5.6.7"
+gem "puma", "~> 5.6.8"
 gem "recipient_interceptor", "~> 0.3.1"
 gem "redcarpet", "~> 3.6.0"
 gem "responders", "~> 3.1.0"
@@ -59,7 +59,7 @@ gem "turbolinks", "~> 5.2.1"
 gem "turnout", "~> 2.5.0"
 gem "uglifier", "~> 4.2.0"
 gem "uuidtools", "~> 2.2.0"
-gem "view_component", "~> 3.6.0"
+gem "view_component", "~> 3.11.0"
 gem "whenever", "~> 1.0.0", require: false
 gem "wicked_pdf", "~> 2.7.0"
 gem "wkhtmltopdf-binary", "~> 0.12.6"
@@ -69,10 +69,10 @@ source "https://rails-assets.org" do
 end
 
 group :development, :test do
-  gem "bullet", "~> 7.0.7"
+  gem "bullet", "~> 7.1.6"
   gem "byebug", "~> 11.1.3"
-  gem "factory_bot_rails", "~> 6.2.0"
-  gem "faker", "~> 3.2.1"
+  gem "factory_bot_rails", "~> 6.4.3"
+  gem "faker", "~> 3.2.3"
   gem "i18n-tasks", "~> 0.9.37"
   gem "knapsack", "~> 1.22"
   gem "launchy", "~> 2.5.2"
@@ -82,10 +82,10 @@ group :development, :test do
 end
 
 group :test do
-  gem "capybara", "~> 3.39.2"
+  gem "capybara", "~> 3.40.0"
   gem "capybara-webmock", "~> 0.7.0"
   gem "email_spec", "~> 2.2.2"
-  gem "pdf-reader"
+  gem "pdf-reader", "~> 2.12.0"
   gem "rspec-rails", "~> 5.1.2"
   gem "selenium-webdriver", "~> 4.16.0"
   gem "simplecov", "~> 0.22.0", require: false
@@ -100,18 +100,18 @@ group :development do
   gem "capistrano3-delayed-job", "~> 1.7.6"
   gem "capistrano3-puma", "~> 5.2.0"
   gem "erb_lint", "~> 0.5.0", require: false
-  gem "mdl", "~> 0.12.0", require: false
+  gem "mdl", "~> 0.13.0", require: false
   gem "pronto", "~> 0.11.1", require: false
   gem "pronto-erb_lint", "~> 0.1.6", require: false
   gem "pronto-eslint", "~> 0.11.1", require: false
   gem "pronto-rubocop", "~> 0.11.5", require: false
   gem "pronto-scss", "~> 0.11.0", require: false
   gem "rubocop", "~> 1.56.4", require: false
-  gem "rubocop-capybara", "~> 2.19.0", require: false
-  gem "rubocop-factory_bot", "~> 2.24.0", require: false
+  gem "rubocop-capybara", "~> 2.20.0", require: false
+  gem "rubocop-factory_bot", "~> 2.25.1", require: false
   gem "rubocop-performance", "~> 1.19.1", require: false
-  gem "rubocop-rails", "~> 2.21.2", require: false
-  gem "rubocop-rspec", "~> 2.24.1", require: false
+  gem "rubocop-rails", "~> 2.23.1", require: false
+  gem "rubocop-rspec", "~> 2.27.0", require: false
   gem "rvm1-capistrano3", "~> 1.4.0", require: false
   gem "scss_lint", "~> 0.60.0", require: false
   gem "web-console", "~> 4.2.1"