Skip to content

Commit

Permalink
Merge pull request #3 from Platoniq/chore/upgrade-0.27
Browse files Browse the repository at this point in the history
Upgrade 0.27
  • Loading branch information
fblupi authored Jul 10, 2023
2 parents 1bfe36a + 774fa97 commit fddb8be
Show file tree
Hide file tree
Showing 219 changed files with 174,008 additions and 13,389 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
pull_request:

env:
RUBY_VERSION: 2.7.5
RUBY_VERSION: 3.0.2
NODE_VERSION: 16.9.1

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

env:
RUBY_VERSION: 2.7.5
RUBY_VERSION: 3.0.2
NODE_VERSION: 16.9.1

jobs:
Expand Down Expand Up @@ -51,10 +51,12 @@ jobs:
bundle exec rake assets:precompile
env:
RAILS_ENV: test
DATABASE_USERNAME: postgres
DATABASE_PASSWORD: postgres

- name: Run RSpec
run: SIMPLECOV=1 CODECOV=1 bundle exec rspec
env:
RAILS_ENV: test
DATABASE_USERNAME: postgres
DATABASE_PASSWORD: postgres
DATABASE_PASSWORD: postgres
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -59,4 +59,7 @@ node_modules
/node_modules
/yarn-error.log
yarn-debug.log*
.yarn-integrity
.yarn-integrity

public/sw.js
public/sw.js.map
2 changes: 1 addition & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
inherit_from: https://raw.githubusercontent.com/decidim/decidim/release/0.25-stable/.rubocop.yml
inherit_from: https://raw.githubusercontent.com/decidim/decidim/release/0.27-stable/.rubocop.yml

AllCops:
Include:
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.2
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
FROM decidim/decidim:0.21.0
FROM decidim/decidim:0.27.3
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 = { git: "https://github.com/Platoniq/decidim.git", branch: "release/0.25-stable" }.freeze
DECIDIM_VERSION = { git: "https://github.com/decidim/decidim", branch: "release/0.27-stable" }.freeze

gem "decidim", DECIDIM_VERSION
# gem "decidim-initiatives", DECIDIM_VERSION
gem "decidim-conferences", DECIDIM_VERSION
gem "decidim-consultations", DECIDIM_VERSION
gem "decidim-decidim_awesome", "~> 0.8"
gem "decidim-term_customizer", git: "https://github.com/Platoniq/decidim-module-term_customizer", branch: "release/0.25-stable"
gem "decidim-decidim_awesome", git: "https://github.com/decidim-ice/decidim-module-decidim_awesome", branch: "main"
gem "decidim-term_customizer", git: "https://github.com/Platoniq/decidim-module-term_customizer", branch: "master"

gem "bootsnap", "~> 1.4"
gem "health_check"
Expand Down
Loading

0 comments on commit fddb8be

Please sign in to comment.