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/redesign #113

Merged
merged 31 commits into from
Mar 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
c38802c
Upgrade Decidim to 0.27.4
entantoencuanto Oct 5, 2023
77d1bc5
Add static pages
entantoencuanto Oct 5, 2023
a923a80
Update .gitignore
entantoencuanto Oct 5, 2023
3160f30
Upgrade decidim version and use compatible decidim-file_authorization…
entantoencuanto Oct 5, 2023
e09e55a
Upgrade social share button configuration
entantoencuanto Oct 5, 2023
f2785ff
Update gitignore with tailwind
entantoencuanto Oct 5, 2023
ff0317a
Upgrade node-version
entantoencuanto Oct 5, 2023
84398c1
Update static views
entantoencuanto Oct 5, 2023
e363c0f
Update webpack
entantoencuanto Oct 5, 2023
02bc8f1
Update migrations
entantoencuanto Oct 5, 2023
7c94a41
Remove yarn tasks
entantoencuanto Oct 5, 2023
a2a0736
Avoid compilation errors in decidim_application.scss
entantoencuanto Oct 5, 2023
589706f
Use 6.1 Rails defaults
entantoencuanto Oct 5, 2023
898df90
Update locales configuration
entantoencuanto Oct 5, 2023
f28df6e
Add temporary missing translations
entantoencuanto Oct 5, 2023
529a8ae
Downgrade Ruby version
entantoencuanto Oct 6, 2023
2bb71e7
Upgrade Ruby version in Docker
ferblape Oct 10, 2023
739538f
Add nvmrc file
ferblape Oct 10, 2023
5a940fd
Adapt personalizations file
entantoencuanto Oct 18, 2023
5c3d79c
Update Decidim version to 0.28.0.rc1 and upgrade file authorization h…
entantoencuanto Nov 30, 2023
18142d5
Add pending migrations
entantoencuanto Nov 30, 2023
f936614
Install shakapacker
entantoencuanto Nov 30, 2023
608f4fc
Update decidim-verify_wo_registration version
entantoencuanto Dec 1, 2023
8d78ada
Add arm platform
ferblape Dec 5, 2023
4974e0c
Test nginx conf parameter
ferblape Dec 5, 2023
6abd60c
Fix ruby verison
ferblape Dec 5, 2023
b7329f9
Update verify_wo_registration to latest revision
entantoencuanto Dec 21, 2023
d432d2f
Bump to Decidim 0.28 stable version
ferblape Mar 12, 2024
9086895
Install term customizer for 0.28
ferblape Mar 12, 2024
0ed6f00
Fix complexity API limits
ferblape Mar 14, 2024
491f5ec
Typo
ferblape Mar 14, 2024
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
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,15 @@
# Ignore Byebug command history file.
.byebug_history

# Ignore master key for decrypting credentials and more.
/config/master.key

# Ignore public uploads
public/uploads

# Ignore Tailwind configuration
tailwind.config.js

# Ignore application configuration
/config/application.yml

Expand Down
2 changes: 1 addition & 1 deletion .node-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16.13.0
18.17.1
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
16.13.0
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.7.5
3.1.1
6 changes: 3 additions & 3 deletions Dockerfile.production
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ RUN rm /etc/nginx/sites-enabled/default
RUN mkdir -p $HOME
WORKDIR $HOME

RUN bash -lc 'rvm install ruby-2.7.5'
RUN bash -lc 'rvm --default use ruby-2.7.5'
RUN bash -lc 'rvm install ruby-3.1.1'
RUN bash -lc 'rvm --default use ruby-3.1.1'

RUN gem install bundler -v 1.17.3
RUN gem install bundler -v 2.4.10

# Install bundle of gems
ADD Gemfile Gemfile
Expand Down
15 changes: 8 additions & 7 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
# frozen_string_literal: true

source 'https://rubygems.org'
DECIDIM_VERSION = { git: 'https://github.com/decidim/decidim', tag: 'v0.28.0' }.freeze

ruby '2.7.5'
source "https://rubygems.org"

DECIDIM_VERSION = "0.26.4"
ruby '3.1.1'

gem 'decidim', git: "https://github.com/PopulateTools/decidim", branch: "release/0.26-stable-budgets-improvements"
gem "decidim-verify_wo_registration", git: "https://github.com/PopulateTools/decidim-verify_wo_registration.git", branch: "improve-ui-texts"
gem "decidim-file_authorization_handler", git: "https://github.com/PopulateTools/decidim-file_authorization_handler.git", branch: "support-decidim-0-26-4"
gem "decidim-term_customizer", git: "https://github.com/mainio/decidim-module-term_customizer.git", branch: "release/0.26-stable"

gem "decidim", DECIDIM_VERSION
gem "decidim-verify_wo_registration", git: "https://github.com/PopulateTools/decidim-verify_wo_registration.git", branch: "improve-ui-texts-redesign"
gem "decidim-file_authorization_handler", git: "https://github.com/PopulateTools/decidim-file_authorization_handler.git", branch: "upgrade/redesign"
gem "decidim-term_customizer", git: "https://github.com/mainio/decidim-module-term_customizer.git", branch: "master"

gem 'puma'
gem 'sidekiq'
Expand Down
Loading
Loading