Skip to content

Commit

Permalink
Upgrade/redesign (#113)
Browse files Browse the repository at this point in the history
* Upgrade Decidim to 0.27.4

* Add static pages

* Update .gitignore

* Upgrade decidim version and use compatible decidim-file_authorization_handler

* Upgrade social share button configuration

* Update gitignore with tailwind

* Upgrade node-version

* Update static views

* Update webpack

* Update migrations

* Remove yarn tasks

* Avoid compilation errors in decidim_application.scss

* Use 6.1 Rails defaults

* Update locales configuration

* Add temporary missing translations

* Downgrade Ruby version

* Upgrade Ruby version in Docker

* Add nvmrc file

* Adapt personalizations file

* Update Decidim version to 0.28.0.rc1 and upgrade file authorization handler to compatible version

* Add pending migrations

* Install shakapacker

* Update decidim-verify_wo_registration version

* Add arm platform

* Test nginx conf parameter

* Fix ruby verison

* Update verify_wo_registration to latest revision

* Bump to Decidim 0.28 stable version

* Install term customizer for 0.28

* Fix complexity API limits

* Typo

---------

Co-authored-by: Fernando Blat <[email protected]>
  • Loading branch information
entantoencuanto and ferblape authored Mar 14, 2024
1 parent 4a580d6 commit 7b7f2d5
Show file tree
Hide file tree
Showing 248 changed files with 193,304 additions and 15,738 deletions.
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

0 comments on commit 7b7f2d5

Please sign in to comment.