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 decidim to 0.27 #56

Merged
merged 1 commit into from
Oct 6, 2023
Merged
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
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
pull_request:

env:
RUBY_VERSION: 2.7.5
RUBY_VERSION: 3.0.6
NODE_VERSION: 16.9.1

jobs:
Expand All @@ -17,7 +17,7 @@ jobs:
runs-on: ubuntu-20.04
if: "!startsWith(github.head_ref, 'chore/l10n')"
steps:
- uses: actions/checkout@v3.3.0
- uses: actions/checkout@v4.1.0
with:
fetch-depth: 1

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
pull_request:

env:
RUBY_VERSION: 2.7.5
RUBY_VERSION: 3.0.6
NODE_VERSION: 16.9.1
RAILS_ENV: test
DATABASE_USERNAME: postgres
Expand All @@ -29,7 +29,7 @@ jobs:
options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5

steps:
- uses: actions/checkout@v3.3.0
- uses: actions/checkout@v4.1.0
with:
fetch-depth: 1

Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -48,3 +48,6 @@ coverage/

config/deploy*
Capfile

public/sw.js
public/sw.js.map
11 changes: 6 additions & 5 deletions .rubocop_ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ AllCops:
- "**/Gemfile"
- "**/Rakefile"
Exclude:
- "**/node_modules/**/*"
- "**/vendor/**/*"
- "development_app/**/*"
- "spec/decidim_dummy_app/**/*"
Expand Down Expand Up @@ -69,12 +70,12 @@ 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: 2.7
TargetRubyVersion: 3.0

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

# Indent private/protected/public as deep as method definitions
Layout/AccessModifierIndentation:
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.7.5
3.0.6
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
FROM decidim/decidim:0.26.8
FROM decidim/decidim:0.27.4
6 changes: 3 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ source "https://rubygems.org"

ruby RUBY_VERSION

DECIDIM_VERSION = "0.26.8"
DECIDIM_VERSION = "0.27.4"

gem "decidim", DECIDIM_VERSION
gem "decidim-consultations", DECIDIM_VERSION

gem "decidim-action_delegator", github: "coopdevs/decidim-module-action_delegator", branch: "main"
gem "decidim-decidim_awesome", github: "decidim-ice/decidim-module-decidim_awesome", branch: "main"
gem "decidim-term_customizer", github: "mainio/decidim-module-term_customizer", branch: "release/0.26-stable"
gem "decidim-term_customizer", github: "mainio/decidim-module-term_customizer", branch: "master"

gem "bootsnap", "~> 1.3"

Expand All @@ -30,7 +30,7 @@ group :development, :test do
end

group :development do
gem "letter_opener_web", "~> 1.3"
gem "letter_opener_web", "~> 2.0"
gem "listen", "~> 3.1"
gem "spring", "~> 2.0"
gem "spring-watcher-listen", "~> 2.0"
Expand Down
Loading