Skip to content

Commit

Permalink
Bump decidim from v0.27.3 to v0.28.0.rc4 (#120)
Browse files Browse the repository at this point in the history
* Bump decidim from v0.27.3 to v0.28.0.rc2

- Removes the decidim-consultations module
- Disables the decidim-term_customizer module
- Removes the customized Menu logic (temporarily)
- Removes the customized stylesheets (temporarily)

* Reintroduce Decidim::MenuHelper customization

With the redesign, now it's on a ContentBlock

* Reintroduce Metadecidim colors

Now we'll do it on the seeds, as in production we would like to use the
administration panel for this.

* Fix specs

* Add workaround for missing icon from registry

* Bump ruby and node versions from GH Actions' workflow config

* Remove unecessary spec

* Remove tailwind.config.js file and add it to gitignore

* Bump decidim from 0.28.0.rc2 to 0.28.0.rc3

* Run `bin/rails decidim:upgrade` command

Mentioned in code review

* Remove workaround as the missing icon exception was fixed upstream

Detected on code review

* Ignore shakapacker:check_yarn task

* Revert "Ignore shakapacker:check_yarn task"

This reverts commit bac9015.

* Add yarn to engines

* Bump to decidim-0.28.rc4

* Add decidim icon

* Change registered icon

---------

Co-authored-by: Francisco Bolívar <[email protected]>
Co-authored-by: Alexandru Emil Lupu <[email protected]>
  • Loading branch information
3 people authored Dec 12, 2023
1 parent 3e7c2f2 commit 5e13727
Show file tree
Hide file tree
Showing 209 changed files with 28,002 additions and 14,937 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/decidim_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ name: "[CI] Decidim"
on: [push]

env:
RUBY_VERSION: 3.0.2
NODE_VERSION: 16.9.1
RUBY_VERSION: 3.1.1
NODE_VERSION: 18.17.1

jobs:
tests:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,4 @@ storage/
yarn-debug.log*
yarn-error.log

tailwind.config.js
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 .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.0.2
3.1.1
7 changes: 3 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,13 @@ source "https://rubygems.org"

ruby RUBY_VERSION

#DECIDIM_VERSION = { github: "decidim/decidim", branch: "release/0.26-stable" }
DECIDIM_VERSION = "0.27.3"
# DECIDIM_VERSION = { github: "decidim/decidim", branch: "release/0.26-stable" }
DECIDIM_VERSION = "0.28.0.rc4"

gem "decidim", DECIDIM_VERSION
gem "decidim-initiatives", DECIDIM_VERSION
gem "decidim-consultations", DECIDIM_VERSION
gem "decidim-conferences", DECIDIM_VERSION
gem "decidim-term_customizer", { git: "https://github.com/mainio/decidim-module-term_customizer", branch: "develop" }
# gem "decidim-term_customizer", { git: "https://github.com/mainio/decidim-module-term_customizer", branch: "develop" }

gem "omniauth-decidim", "0.2.1"

Expand Down
Loading

0 comments on commit 5e13727

Please sign in to comment.