Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade CONSUL DEMOCRACY to version 2.1.1 #161

Merged
merged 62 commits into from
Apr 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
81d768f
Refactor regex in normalized_coordinates method to allow for whitespa…
coslajohn Feb 9, 2024
ac34657
Bump puma from 5.6.7 to 5.6.8
dependabot[bot] Feb 23, 2024
07e4b8f
Merge pull request #5365 from consuldemocracy/dependabot/bundler/puma…
javierm Feb 23, 2024
9ecab3b
Bump Rails to version 6.1.7.7
javierm Feb 26, 2024
65ad182
Merge pull request #5401 from consuldemocracy/dependabot/bundler/rail…
javierm Feb 28, 2024
5772e1b
Bump rubocop-capybara from 2.19.0 to 2.20.0
dependabot[bot] Mar 1, 2024
4c4699c
Merge pull request #5383 from consuldemocracy/dependabot/bundler/rubo…
javierm Mar 1, 2024
7fc40ef
Bump rubocop-factory_bot from 2.24.0 to 2.25.1
dependabot[bot] Mar 1, 2024
8c0c952
Merge pull request #5385 from consuldemocracy/dependabot/bundler/rubo…
javierm Mar 1, 2024
86b72ad
Bump rubocop-rspec from 2.24.1 to 2.27.0
dependabot[bot] Mar 1, 2024
ed24a16
Merge pull request #5405 from consuldemocracy/dependabot/bundler/rubo…
javierm Mar 1, 2024
139da18
Bump capybara from 3.39.2 to 3.40.0
dependabot[bot] Mar 1, 2024
5658b6f
Merge pull request #5378 from consuldemocracy/dependabot/bundler/capy…
javierm Mar 1, 2024
b60d2f4
Update checkout action to version 3
javierm Mar 1, 2024
e9af16f
Merge pull request #5407 from consuldemocracy/update_checkout_action
javierm Mar 1, 2024
e07650e
Update upload artifact action to version 3
javierm Mar 1, 2024
dc52673
Merge pull request #5411 from consuldemocracy/update_upload_artifact_…
javierm Mar 1, 2024
3fa16bc
Update checkout action to version 4
javierm Mar 1, 2024
fbe46c9
Merge pull request #5415 from consuldemocracy/update_checkout_action_…
javierm Mar 1, 2024
23e5489
Update setup-node action to version 4
javierm Mar 1, 2024
1fe0393
Merge pull request #5419 from consuldemocracy/update_setup_node_actio…
javierm Mar 1, 2024
bbb4c84
Bump rubocop-rails from 2.21.2 to 2.23.1
dependabot[bot] Mar 1, 2024
acfaada
Update upload artifact action to version 4
javierm Mar 1, 2024
7ae8df8
Merge pull request #5362 from consuldemocracy/dependabot/bundler/rubo…
javierm Mar 2, 2024
5624e0f
Merge pull request #5420 from consuldemocracy/update_upload_artifact_…
javierm Mar 2, 2024
99b9167
Bump mdl from 0.12.0 to 0.13.0
dependabot[bot] Mar 2, 2024
70edfbe
Merge pull request #5290 from consuldemocracy/dependabot/bundler/mdl-…
javierm Mar 2, 2024
56311ee
Bump factory_bot_rails from 6.2.0 to 6.4.3
dependabot[bot] Mar 2, 2024
a30917b
Merge pull request #5356 from consuldemocracy/dependabot/bundler/fact…
javierm Mar 2, 2024
518eb33
Bump faker from 3.2.1 to 3.2.3
dependabot[bot] Mar 2, 2024
8ec1edc
Merge pull request #5373 from consuldemocracy/dependabot/bundler/fake…
javierm Mar 2, 2024
ac9472c
Bump pdf-reader from 2.11.0 to 2.12.0
dependabot[bot] Mar 2, 2024
a6f3952
Merge pull request #5361 from consuldemocracy/dependabot/bundler/pdf-…
javierm Mar 2, 2024
331784e
Bump bullet from 7.0.7 to 7.1.6
dependabot[bot] Mar 2, 2024
8ac1acc
Merge pull request #5374 from consuldemocracy/dependabot/bundler/bull…
javierm Mar 2, 2024
52ec509
Bump view_component from 3.6.0 to 3.11.0
dependabot[bot] Feb 23, 2024
1d955b7
Simplify using helper methods in components
javierm Feb 23, 2024
2af1fc7
Prevent Unable to autoload constant error in tests
javierm Mar 2, 2024
c480cdd
Don't create records after a visit in polls tests
javierm Mar 2, 2024
deb8b37
Simplify creating a proposal poll in a test
javierm Mar 2, 2024
a101608
Fix invalid HTML in comment votes
javierm Mar 4, 2024
8b3ec8f
Applied patch to tidy whitespace and add tests
coslajohn Mar 7, 2024
3d63238
Add missing Spanish translations
javierm Feb 28, 2024
8006227
Merge pull request #5403 from consuldemocracy/missing_spanish_transla…
javierm Mar 8, 2024
a670b77
Merge pull request #5399 from consuldemocracy/dependabot/bundler/view…
javierm Mar 18, 2024
d921eee
Update Code Climate Rubocop version
javierm Feb 23, 2024
bbac39e
Merge pull request #5426 from consuldemocracy/fix_comment_votes_html
javierm Mar 18, 2024
8ba37b2
Temporarily disable a test that fails sometimes
javierm Mar 18, 2024
c7ea55a
Merge pull request #5431 from consuldemocracy/rubocop_capybara_code_c…
javierm Mar 18, 2024
0972bcb
Merge pull request #5422 from consuldemocracy/fix_polls_test
javierm Mar 18, 2024
1a22db8
Fix link to debates help
javierm Feb 22, 2024
0658edb
Merge pull request #5395 from consuldemocracy/fix_new_window_typo
javierm Mar 18, 2024
77505db
Merge pull request #5389 from CoslaDigital/render_geojson
javierm Mar 18, 2024
86cf674
Add Rails/DeprecatedActiveModelErrorsMethods rule
javierm Mar 2, 2024
d0fae33
Add and apply Rails/WhereMissing rubocop rule
javierm Mar 2, 2024
42eff36
Merge pull request #5421 from consuldemocracy/rails6.1_rubocop_rules
javierm Mar 18, 2024
669472c
Sanitize the output of a dummy component class
javierm Mar 18, 2024
31f42a2
Merge pull request #5432 from consuldemocracy/fix_unsafe_spec_warning
javierm Mar 19, 2024
b9e939d
Release version 2.1.1
javierm Mar 5, 2024
82c24a7
Merge pull request #5428 from consuldemocracy/release_2.1.1
javierm Mar 21, 2024
2a6809b
Merge tag '2.1.1' into release_2.1.1
microweb10 Apr 3, 2024
9c37d0f
Fix specs after upgrade
microweb10 Apr 3, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .codeclimate.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
engines:
rubocop:
enabled: true
channel: rubocop-1-31-0
channel: rubocop-1-56-3
duplication:
enabled: true
config:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/db_schema.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/linters.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand Down
8 changes: 8 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -505,6 +510,9 @@ Rails/Validation:
Rails/WhereEquals:
Enabled: true

Rails/WhereMissing:
Enabled: true

Rails/WhereNot:
Enabled: true

Expand Down
33 changes: 33 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
26 changes: 13 additions & 13 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -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"
Expand Down Expand Up @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand All @@ -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
Expand All @@ -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"
Expand Down
Loading
Loading