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.

Sign up for GitHub

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

Bump decidim from v0.27.3 to v0.28.0.rc4 #120

Merged
merged 17 commits into from
Dec 12, 2023
Merged

Bump decidim from v0.27.3 to v0.28.0.rc4 #120

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
a994e24
Bump decidim from v0.27.3 to v0.28.0.rc2
andreslucena Dec 4, 2023
4ae7a96
Reintroduce Decidim::MenuHelper customization
andreslucena Dec 4, 2023
029a5d3
Reintroduce Metadecidim colors
andreslucena Dec 4, 2023
a74d1e4
Fix specs
andreslucena Dec 4, 2023
ed08657
Add workaround for missing icon from registry
andreslucena Dec 4, 2023
a6b9244
Bump ruby and node versions from GH Actions' workflow config
andreslucena Dec 4, 2023
dadf66d
Remove unecessary spec
andreslucena Dec 5, 2023
814e800
Remove tailwind.config.js file and add it to gitignore
andreslucena Dec 5, 2023
18844ea
Bump decidim from 0.28.0.rc2 to 0.28.0.rc3
andreslucena Dec 5, 2023
5b7c67d
Run `bin/rails decidim:upgrade` command
andreslucena Dec 11, 2023
5a17e4a
Remove workaround as the missing icon exception was fixed upstream
andreslucena Dec 11, 2023
bac9015
Ignore shakapacker:check_yarn task
fblupi Dec 11, 2023
9cf01a5
Revert "Ignore shakapacker:check_yarn task"
fblupi Dec 11, 2023
731df2f
Add yarn to engines
fblupi Dec 11, 2023
0de3166
Bump to decidim-0.28.rc4
alecslupu Dec 11, 2023
33478cf
Add decidim icon
alecslupu Dec 11, 2023
ef3009d
Change registered icon
fblupi Dec 11, 2023
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/decidim_ci.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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.rc3"

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
Loading