Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
b0bd112
Update ruby version
entantoencuanto Mar 3, 2026
487bcaa
Upgrade dependencies
entantoencuanto Mar 3, 2026
1bee351
Update Gemfile.lock
entantoencuanto Mar 3, 2026
7315be9
Update existing migration files
entantoencuanto Mar 3, 2026
6e57ab2
Add new migrations
entantoencuanto Mar 3, 2026
818dee1
Update db/schema.rb
entantoencuanto Mar 3, 2026
d5c0a34
Update modules versions
entantoencuanto Mar 3, 2026
bebccc0
Fix task
entantoencuanto Mar 3, 2026
f8e725b
Upgrade js dependencies
entantoencuanto Mar 3, 2026
98639ab
Update ruby version in Dockerfile.production
entantoencuanto Mar 3, 2026
088bb57
Add missing dependency
entantoencuanto Mar 4, 2026
2850430
Update base64 gem version
entantoencuanto Mar 5, 2026
aaf7e6f
Upgrade bundler version in Dockerfile
entantoencuanto Mar 5, 2026
83c9f81
Upgrade bundler version
entantoencuanto Mar 5, 2026
6d64a6c
Change dockerfile dependencies
entantoencuanto Mar 5, 2026
183cf3d
Remove jemalloc support
entantoencuanto Mar 5, 2026
031638d
Fix stringio gem version
entantoencuanto Mar 9, 2026
21d9c18
Update Decidim revision
entantoencuanto Mar 9, 2026
cb226cc
Update js dependencies
entantoencuanto Mar 9, 2026
44a3bc7
Add pending migration
entantoencuanto Mar 9, 2026
3be5f34
Update db/schema.rb
entantoencuanto Mar 9, 2026
978c968
Recover jemalloc support
entantoencuanto Mar 9, 2026
6356ded
Use fork of Decidim 0.30 including links in editor images feature
entantoencuanto Mar 10, 2026
5ca0214
Use fork of decidim awesome 0.30 including autoblock and attachments …
entantoencuanto Mar 10, 2026
4461289
Add maintenance mode
entantoencuanto Mar 13, 2026
6cde3aa
Do not replace wrong variables
entantoencuanto Mar 13, 2026
54444e2
Fix email configuration
entantoencuanto Mar 17, 2026
69f3f96
Update homepage_proposals revision
entantoencuanto Mar 17, 2026
ba27e98
Upgrade decidim and homepage proposals revisions
entantoencuanto Mar 18, 2026
5b72470
Add task to remove blank filters
entantoencuanto Mar 18, 2026
3d1c8f0
Upgrade ruby versions in workflows
entantoencuanto Mar 24, 2026
9bd7d32
Update decidim-census deps
entantoencuanto Mar 24, 2026
dbb72ad
Override sanitization helper method
entantoencuanto Mar 26, 2026
f214f9e
Upgrade Decidim to 0.30.7
entantoencuanto Mar 26, 2026
20596ad
Update newsletter decorator
entantoencuanto Mar 27, 2026
f13f9bf
Update test
entantoencuanto Mar 27, 2026
5303f4d
Update test
entantoencuanto Mar 27, 2026
c0635d3
Update test
entantoencuanto Mar 27, 2026
fd91515
Update Decidim version in modules
entantoencuanto Mar 30, 2026
7bcb0c6
Update overridden partials to 0.30 version
entantoencuanto Mar 30, 2026
7f6880b
Make method public
entantoencuanto Mar 30, 2026
6f6596f
Fix newsletter override
entantoencuanto Mar 31, 2026
a5fe966
Remove deprecated override
entantoencuanto Mar 31, 2026
fa979da
Update removable authorizations version to compatibilize with 0.30
entantoencuanto Apr 1, 2026
0eea5f7
Create and register ephemeral workflow for diba authorization (combined)
entantoencuanto Apr 1, 2026
005bf38
Create and register ephemeral workflow for census (Excel)
entantoencuanto Apr 1, 2026
efe50e2
Create and register ephemeral workflow for census (API)
entantoencuanto Apr 1, 2026
871ed7f
Add newsletter confirm_recipients override
entantoencuanto Apr 7, 2026
42fa036
Add required can_participate? method to Decidim::Verifications::Confl…
entantoencuanto Apr 7, 2026
250e773
Enable pgcrypto in GitHub workflow
entantoencuanto Apr 30, 2026
8d3ca7c
Upgrade version of postgres in GitHub workflow
entantoencuanto Apr 30, 2026
4236c79
Upgrade version of postgres in all GitHub workflows
entantoencuanto Apr 30, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions .github/workflows/ci_age_action_authorization.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ on:
pull_request:

env:
RUBY_VERSION: 3.2.6
RUBY_VERSION: 3.3.4

jobs:
test-report:
runs-on: ubuntu-latest

services:
postgres:
image: postgres:11
image: postgres:14
ports: ["5432:5432"]
options: >-
--health-cmd pg_isready
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci_app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
pull_request:

env:
RUBY_VERSION: 3.2.6
RUBY_VERSION: 3.3.4
NODE_VERSION: 18.17.1

jobs:
Expand All @@ -18,7 +18,7 @@ jobs:

services:
postgres:
image: postgres:11
image: postgres:14
ports: ["5432:5432"]
options: >-
--health-cmd pg_isready
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci_census.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ on:
pull_request:

env:
RUBY_VERSION: 3.2.6
RUBY_VERSION: 3.3.4

jobs:
test-report:
runs-on: ubuntu-latest

services:
postgres:
image: postgres:11
image: postgres:14
ports: ["5432:5432"]
options: >-
--health-cmd pg_isready
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci_diba_census_api.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ on:
pull_request:

env:
RUBY_VERSION: 3.2.6
RUBY_VERSION: 3.3.4

jobs:
test-report:
runs-on: ubuntu-latest

services:
postgres:
image: postgres:11
image: postgres:14
ports: ["5432:5432"]
options: >-
--health-cmd pg_isready
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci_ldap.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ on:
pull_request:

env:
RUBY_VERSION: 3.2.6
RUBY_VERSION: 3.3.4

jobs:
test-report:
runs-on: ubuntu-latest

services:
postgres:
image: postgres:11
image: postgres:14
ports: ["5432:5432"]
options: >-
--health-cmd pg_isready
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/linters.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
pull_request:

env:
RUBY_VERSION: 3.2.6
RUBY_VERSION: 3.3.4

jobs:
lint:
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ruby-3.2.6
ruby-3.3.4
17 changes: 11 additions & 6 deletions Dockerfile.production
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM phusion/passenger-full:2.1.0
FROM phusion/passenger-full:3.1.6
MAINTAINER Populate "fernando@populate.tools"

ENV HOME /home/app/decidim-diba
Expand All @@ -17,12 +17,11 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
RUN apt install -y ca-certificates
RUN apt-get --allow-releaseinfo-change update
RUN apt-get update
RUN apt-get install -y clang build-essential
RUN apt-get install -y imagemagick gettext-base tzdata
RUN apt-get install -y p7zip
RUN apt-get install -y xfonts-base
RUN apt-get install -y xfonts-75dpi
RUN curl "https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox_0.12.6-1.bionic_amd64.deb" -L -o "wkhtmltox_0.12.6-1.bionic_amd64.deb"
RUN dpkg -i wkhtmltox_0.12.6-1.bionic_amd64.deb

RUN apt-get install -y --no-install-recommends libjemalloc2
ENV LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libjemalloc.so.2
Expand Down Expand Up @@ -67,11 +66,17 @@ RUN rm /etc/nginx/sites-enabled/default
RUN mkdir -p $HOME
WORKDIR $HOME

RUN bash -lc 'rvm install ruby-3.2.6'
RUN bash -lc 'rvm --default use ruby-3.2.6'
RUN bash -lc 'rvm install ruby-3.3.4'
RUN bash -lc 'rvm --default use ruby-3.3.4'

# Install bundle of gems
RUN gem install bundler:2.5.6
RUN gem update --system \
&& gem install bundler:4.0.7 \
&& gem uninstall bundler --version 2.5.11 --force --ignore-dependencies \
&& gem install strscan:3.1.2 \
&& gem uninstall strscan --version 3.0.9 --force --ignore-dependencies \
&& gem install stringio:3.2.0 \
&& gem uninstall stringio --version 3.1.1 --force --ignore-dependencies
RUN gem install rake:13.2.1
ADD Gemfile Gemfile
ADD Gemfile.lock Gemfile.lock
Expand Down
17 changes: 9 additions & 8 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,23 @@ source "https://rubygems.org"

ruby RUBY_VERSION

DECIDIM_VERSION = { git: "https://github.com/PopulateTools/decidim.git", branch: "tiptap-image-links_0.29" }.freeze
DECIDIM_VERSION = { git: "https://github.com/PopulateTools/decidim.git", branch: "tiptap-image-links_0.30" }.freeze

gem "decidim", DECIDIM_VERSION
gem "decidim-age_action_authorization", path: "decidim-age_action_authorization"
gem "decidim-census", path: "decidim-census"
# gem "decidim-consultations", DECIDIM_VERSION
gem "decidim-decidim_awesome", git: "https://github.com/PopulateTools/decidim-module-decidim_awesome.git", branch: "autoblock_with_attachments_029"
gem "decidim-decidim_awesome", git: "https://github.com/PopulateTools/decidim-module-decidim_awesome.git", branch: "autoblock_with_attachments_030"
gem "decidim-diba_census_api", path: "decidim-diba_census_api"
gem "decidim-initiatives", DECIDIM_VERSION
gem "decidim-ldap", path: "decidim-ldap"
gem "decidim-templates", DECIDIM_VERSION

gem "decidim-homepage_proposals", git: "https://github.com/PopulateTools/decidim-module_homepage_proposals.git", branch: "release/0.29-stable"
gem "decidim-term_customizer", git: "https://github.com/PopulateTools/decidim-module-term_customizer", branch: "upgrade_0.29"
gem "decidim-homepage_proposals", git: "https://github.com/PopulateTools/decidim-module_homepage_proposals.git", branch: "release/0.30-stable"
gem "decidim-term_customizer", git: "https://github.com/Platoniq/decidim-module-term_customizer", branch: "main"

gem "decidim-removable_authorizations", git: "https://github.com/PopulateTools/decidim-module-removable_authorizations.git", branch: "release/0.30-stable"

gem "decidim-removable_authorizations", git: "https://github.com/PopulateTools/decidim-module-removable_authorizations.git", branch: "main"
# Compatibility with decidim initiatives module
gem "bootsnap"
gem "deface"
Expand All @@ -31,9 +32,9 @@ gem "uglifier", ">= 1.3.0"
gem "wicked_pdf"

# Forced by production environment
gem "base64", "0.1.1"
gem "stringio", "3.0.1"
gem "strscan", "3.0.1"
gem "base64", "0.2.0"
gem "stringio", "3.2.0"
gem "strscan", "3.1.2"

group :development, :test do
gem "byebug", platform: :mri
Expand Down
Loading
Loading