Skip to content

Commit

Permalink
Upgrade to Decidim v0.28 (#74)
Browse files Browse the repository at this point in the history
* Upgrade Ruby and Decidim and challenges admin CRUD

* Upgrade: survey in challenges

* Upgrade: challenges

* Changes in show challenges

* More changes in challenges

* Update admin components

* Fix admin tests

* Adapt SDGs list

* Rework challenges

* Rework views in problems

* Some rework in challenges

* Rework solutions views

* Rubocopify

* Fix tests

* Rework all filters and create solutions

* Fix tests and remove category

* Fix styles in global search

* Fix public filters

* Remove unnecesary method

* Rework sdgs filters

* Fix tests

* Small changes

* Rework helper includes
  • Loading branch information
laurajaime authored Dec 16, 2024
1 parent 955215f commit f6e55a4
Show file tree
Hide file tree
Showing 207 changed files with 3,692 additions and 4,377 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/challenges_system_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
pull_request:

env:
RUBY_VERSION: 3.0.6
RUBY_VERSION: 3.1.1

jobs:
test-report:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/linters.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
pull_request:

env:
RUBY_VERSION: 3.0.6
RUBY_VERSION: 3.1.1

jobs:
test-report:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/problems_system_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
pull_request:

env:
RUBY_VERSION: 3.0.6
RUBY_VERSION: 3.1.1

jobs:
test-report:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sgds_system_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
pull_request:

env:
RUBY_VERSION: 3.0.6
RUBY_VERSION: 3.1.1

jobs:
test-report:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/solutions_system_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
pull_request:

env:
RUBY_VERSION: 3.0.6
RUBY_VERSION: 3.1.1

jobs:
test-report:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
pull_request:

env:
RUBY_VERSION: 3.0.6
RUBY_VERSION: 3.1.1

jobs:
test-report:
Expand Down
2 changes: 1 addition & 1 deletion .node-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16.9.1
18.17.1
5 changes: 4 additions & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,13 +64,16 @@ AllCops:
# If a value is specified for TargetRubyVersion then it is used.
# Else if .ruby-version exists and it contains an MRI version it is used.
# Otherwise we fallback to the oldest officially supported Ruby version (2.0).
TargetRubyVersion: 3.0
TargetRubyVersion: 3.1.1

RSpec:
Include:
- "(?:^|/)spec/"
- "(?:^|/)test/"

Capybara/SpecificActions:
Enabled: false

# Indent private/protected/public as deep as method definitions
Layout/AccessModifierIndentation:
EnforcedStyle: indent
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.0.6
3.1.1
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@ Following Semantic Versioning 2.

## next version:

## Version 0.5.0 (MINOR)
- Upgrade module's Ruby to 3.1.1
- Increase minimum Decidim version to 0.28
- Rework views
- Remove categories, as they were not being used

## Version 0.4.2 (MINOR)
- Show create solution button in challenge, show only if there is a solution component.

Expand Down
15 changes: 6 additions & 9 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,24 @@ source "https://rubygems.org"

ruby RUBY_VERSION

DECIDIM_VERSION = { git: "https://github.com/decidim/decidim", branch: "release/0.27-stable" }.freeze
DECIDIM_VERSION = { git: "https://github.com/decidim/decidim", branch: "release/0.28-stable" }.freeze

gem "decidim", DECIDIM_VERSION
gem "decidim-challenges", path: "."

gem "bootsnap", "~> 1.4"
gem "bootsnap"
gem "puma", ">= 4.3"
gem "uglifier", "~> 4.1"
# Remove this nokogiri forces version at any time but make sure that no __truncato_root__ text appears in the cards in general.
# More exactly in comments in the homepage and in processes cards in the processes listing
gem "nokogiri", "1.13.3"

# temporal solution while gems embrace new psych 4 (the default in Ruby 3.1) behavior.
gem "psych", "< 4"

group :development, :test do
gem "byebug", ">= 11.1.3"
gem "decidim-dev", DECIDIM_VERSION
gem "rubocop"
gem "rubocop-rails"
gem "rubocop-rspec"
# Set versions because Property AutoCorrect errors.
gem "rspec-rails", "~> 6.0.4"
gem "rubocop-factory_bot", "2.25.1"
gem "rubocop-rspec", "2.26.1"
end

group :development do
Expand Down
Loading

0 comments on commit f6e55a4

Please sign in to comment.