Skip to content

Commit

Permalink
Upgrade 028 (#115)
Browse files Browse the repository at this point in the history
* Upgrade Decidim to 0.28.1

* Upgrade js dependencies

* Update db/schema.rb

* Update static views

* Add pending migrations

* Upgrade to 0.28.2

* Update js dependencies

* Upgrade to 0.28.3

* Update js dependencies

* Update Dockerfile.production to include p7zip and new wkhtmltox dependencies

* Update secrets.yml

* Upgrade Decidim version to 0.28.4

* Update bundler version

* Downgrade stringio version

* Update file authorization handler module including redesigned form

* Do not force ssl in development environment

* Add decidim-awesome dependency to Gemfile using users_autoblock branch

* Add pending migrations

* Update js dependencies

* Update static views

* Update awesome revision

* Set I18n.available_locales to avoid requesting locales to backend included by term customizer

* Update awesome revision

* Update awesome revision
  • Loading branch information
entantoencuanto authored Jan 8, 2025
1 parent 726bc44 commit 19f85ec
Show file tree
Hide file tree
Showing 177 changed files with 8,992 additions and 4,716 deletions.
5 changes: 5 additions & 0 deletions Dockerfile.production
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@ RUN apt-get update; exit 0
RUN apt-get --allow-releaseinfo-change update
RUN apt-get update
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

# Use baseimage-docker's init system.
CMD ["/sbin/my_init"]
Expand Down
7 changes: 3 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# frozen_string_literal: true

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

source "https://rubygems.org"

Expand All @@ -10,7 +10,8 @@ ruby '3.1.4'
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 "decidim-term_customizer", git: "https://github.com/mainio/decidim-module-term_customizer.git", branch: "main"
gem "decidim-decidim_awesome", git: "https://github.com/decidim-ice/decidim-module-decidim_awesome.git", branch: "users_autoblock"

gem 'puma'
gem 'sidekiq'
Expand All @@ -28,8 +29,6 @@ end
group :development do
gem 'letter_opener_web'
gem 'listen'
gem 'spring'
gem 'spring-watcher-listen'
gem 'web-console'
end

Expand Down
Loading

0 comments on commit 19f85ec

Please sign in to comment.