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 to Decidim v0.28 #74

Open
wants to merge 18 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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 .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
2 changes: 1 addition & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ 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:
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

## 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
Loading