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

update decidim #1

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

update decidim #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0abec9f
update decidim
microstudi Feb 26, 2025
d2a26fe
fix awesome
microstudi Feb 26, 2025
e3dd737
force https in mailer
microstudi Feb 26, 2025
2886722
use main awesome
microstudi Feb 26, 2025
cff2d69
rubocop
microstudi Feb 27, 2025
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 Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ source "https://rubygems.org"

ruby RUBY_VERSION

DECIDIM_VERSION = { github: "decidim/decidim", branch: "release/0.28-stable" }.freeze
DECIDIM_VERSION = { github: "decidim/decidim", branch: "backport/0.28/use-leaflet-tilelayer-here-v20-14164" }.freeze
gem "decidim", DECIDIM_VERSION
# gem "decidim-conferences", DECIDIM_VERSION
# gem "decidim-design", DECIDIM_VERSION
# gem "decidim-elections", DECIDIM_VERSION
# gem "decidim-initiatives", DECIDIM_VERSION
gem "decidim-decidim_awesome"
gem "decidim-decidim_awesome", github: "decidim-ice/decidim-module-decidim_awesome", branch: "main"
gem "decidim-templates", DECIDIM_VERSION
gem "decidim-term_customizer", github: "mainio/decidim-module-term_customizer", branch: "l10n_main"

Expand Down
190 changes: 98 additions & 92 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,56 +1,67 @@
GIT
remote: https://github.com/decidim-ice/decidim-module-decidim_awesome.git
revision: 84ebe63ad748cb67691452025636ddce375e7247
branch: main
specs:
decidim-decidim_awesome (0.11.3)
decidim-admin (>= 0.28.0, < 0.29)
decidim-core (>= 0.28.0, < 0.29)
deface (>= 1.5)
sassc (~> 2.3)

GIT
remote: https://github.com/decidim/decidim.git
revision: 3fb1b5e02ca903264e64b8f234d565f68aed902c
branch: release/0.28-stable
revision: fe34a4f5312a7552337b27fe55e255c2f34d5004
branch: backport/0.28/use-leaflet-tilelayer-here-v20-14164
specs:
decidim (0.28.4)
decidim-accountability (= 0.28.4)
decidim-admin (= 0.28.4)
decidim-api (= 0.28.4)
decidim-assemblies (= 0.28.4)
decidim-blogs (= 0.28.4)
decidim-budgets (= 0.28.4)
decidim-comments (= 0.28.4)
decidim-core (= 0.28.4)
decidim-debates (= 0.28.4)
decidim-forms (= 0.28.4)
decidim-generators (= 0.28.4)
decidim-meetings (= 0.28.4)
decidim-pages (= 0.28.4)
decidim-participatory_processes (= 0.28.4)
decidim-proposals (= 0.28.4)
decidim-sortitions (= 0.28.4)
decidim-surveys (= 0.28.4)
decidim-system (= 0.28.4)
decidim-verifications (= 0.28.4)
decidim-accountability (0.28.4)
decidim-comments (= 0.28.4)
decidim-core (= 0.28.4)
decidim-admin (0.28.4)
decidim (0.28.5)
decidim-accountability (= 0.28.5)
decidim-admin (= 0.28.5)
decidim-api (= 0.28.5)
decidim-assemblies (= 0.28.5)
decidim-blogs (= 0.28.5)
decidim-budgets (= 0.28.5)
decidim-comments (= 0.28.5)
decidim-core (= 0.28.5)
decidim-debates (= 0.28.5)
decidim-forms (= 0.28.5)
decidim-generators (= 0.28.5)
decidim-meetings (= 0.28.5)
decidim-pages (= 0.28.5)
decidim-participatory_processes (= 0.28.5)
decidim-proposals (= 0.28.5)
decidim-sortitions (= 0.28.5)
decidim-surveys (= 0.28.5)
decidim-system (= 0.28.5)
decidim-verifications (= 0.28.5)
decidim-accountability (0.28.5)
decidim-comments (= 0.28.5)
decidim-core (= 0.28.5)
decidim-admin (0.28.5)
active_link_to (~> 1.0)
decidim-core (= 0.28.4)
decidim-core (= 0.28.5)
devise (~> 4.7)
devise-i18n (~> 1.2)
devise_invitable (~> 2.0, >= 2.0.9)
decidim-api (0.28.4)
decidim-api (0.28.5)
commonmarker (~> 0.23.0, >= 0.23.9)
decidim-core (= 0.28.4)
decidim-core (= 0.28.5)
graphql (~> 2.0.0)
graphql-docs (~> 3.0.1)
rack-cors (~> 1.0)
decidim-assemblies (0.28.4)
decidim-core (= 0.28.4)
decidim-blogs (0.28.4)
decidim-admin (= 0.28.4)
decidim-comments (= 0.28.4)
decidim-core (= 0.28.4)
decidim-budgets (0.28.4)
decidim-comments (= 0.28.4)
decidim-core (= 0.28.4)
decidim-comments (0.28.4)
decidim-core (= 0.28.4)
decidim-assemblies (0.28.5)
decidim-core (= 0.28.5)
decidim-blogs (0.28.5)
decidim-admin (= 0.28.5)
decidim-comments (= 0.28.5)
decidim-core (= 0.28.5)
decidim-budgets (0.28.5)
decidim-comments (= 0.28.5)
decidim-core (= 0.28.5)
decidim-comments (0.28.5)
decidim-core (= 0.28.5)
redcarpet (~> 3.5, >= 3.5.1)
decidim-core (0.28.4)
decidim-core (0.28.5)
active_link_to (~> 1.0)
acts_as_list (~> 1.0)
batch-loader (~> 1.2)
Expand Down Expand Up @@ -100,14 +111,14 @@ GIT
valid_email2 (~> 4.0)
web-push (~> 3.0)
wisper (~> 2.0)
decidim-debates (0.28.4)
decidim-comments (= 0.28.4)
decidim-core (= 0.28.4)
decidim-dev (0.28.4)
decidim-debates (0.28.5)
decidim-comments (= 0.28.5)
decidim-core (= 0.28.5)
decidim-dev (0.28.5)
bullet (~> 7.0)
byebug (~> 11.0)
capybara (~> 3.39)
decidim (= 0.28.4)
decidim (= 0.28.5)
erb_lint (~> 0.4.0)
factory_bot_rails (~> 6.2)
faker (~> 3.2)
Expand All @@ -134,43 +145,43 @@ GIT
w3c_rspec_validators (~> 0.3.0)
webmock (~> 3.18)
wisper-rspec (~> 1.0)
decidim-forms (0.28.4)
decidim-core (= 0.28.4)
decidim-forms (0.28.5)
decidim-core (= 0.28.5)
wicked_pdf (~> 2.1)
decidim-generators (0.28.4)
decidim-core (= 0.28.4)
decidim-meetings (0.28.4)
decidim-core (= 0.28.4)
decidim-forms (= 0.28.4)
decidim-generators (0.28.5)
decidim-core (= 0.28.5)
decidim-meetings (0.28.5)
decidim-core (= 0.28.5)
decidim-forms (= 0.28.5)
icalendar (~> 2.5)
decidim-pages (0.28.4)
decidim-core (= 0.28.4)
decidim-participatory_processes (0.28.4)
decidim-core (= 0.28.4)
decidim-proposals (0.28.4)
decidim-comments (= 0.28.4)
decidim-core (= 0.28.4)
decidim-pages (0.28.5)
decidim-core (= 0.28.5)
decidim-participatory_processes (0.28.5)
decidim-core (= 0.28.5)
decidim-proposals (0.28.5)
decidim-comments (= 0.28.5)
decidim-core (= 0.28.5)
doc2text (~> 0.4.6)
redcarpet (~> 3.5, >= 3.5.1)
decidim-sortitions (0.28.4)
decidim-admin (= 0.28.4)
decidim-comments (= 0.28.4)
decidim-core (= 0.28.4)
decidim-proposals (= 0.28.4)
decidim-surveys (0.28.4)
decidim-core (= 0.28.4)
decidim-forms (= 0.28.4)
decidim-system (0.28.4)
decidim-sortitions (0.28.5)
decidim-admin (= 0.28.5)
decidim-comments (= 0.28.5)
decidim-core (= 0.28.5)
decidim-proposals (= 0.28.5)
decidim-surveys (0.28.5)
decidim-core (= 0.28.5)
decidim-forms (= 0.28.5)
decidim-system (0.28.5)
active_link_to (~> 1.0)
decidim-core (= 0.28.4)
decidim-core (= 0.28.5)
devise (~> 4.7)
devise-i18n (~> 1.2)
devise_invitable (~> 2.0, >= 2.0.9)
decidim-templates (0.28.4)
decidim-core (= 0.28.4)
decidim-forms (= 0.28.4)
decidim-verifications (0.28.4)
decidim-core (= 0.28.4)
decidim-templates (0.28.5)
decidim-core (= 0.28.5)
decidim-forms (= 0.28.5)
decidim-verifications (0.28.5)
decidim-core (= 0.28.5)

GIT
remote: https://github.com/mainio/decidim-module-term_customizer.git
Expand Down Expand Up @@ -323,11 +334,6 @@ GEM
date_validator (0.12.0)
activemodel (>= 3)
activesupport (>= 3)
decidim-decidim_awesome (0.11.2)
decidim-admin (>= 0.28.0, < 0.29)
decidim-core (>= 0.28.0, < 0.29)
deface (>= 1.5)
sassc (~> 2.3)
declarative-builder (0.2.0)
trailblazer-option (~> 0.1.0)
declarative-option (0.1.0)
Expand All @@ -348,7 +354,7 @@ GEM
devise_invitable (2.0.9)
actionmailer (>= 5.0)
devise (>= 4.6)
diff-lcs (1.5.1)
diff-lcs (1.6.0)
diffy (3.4.3)
digest (3.2.0)
doc2text (0.4.7)
Expand All @@ -374,8 +380,8 @@ GEM
excon (1.2.3)
extended-markdown-filter (0.7.0)
html-pipeline (~> 2.9)
factory_bot (6.5.0)
activesupport (>= 5.0.0)
factory_bot (6.5.1)
activesupport (>= 6.1.0)
factory_bot_rails (6.4.4)
factory_bot (~> 6.5)
railties (>= 5.0.0)
Expand Down Expand Up @@ -567,7 +573,7 @@ GEM
activerecord (>= 5.2)
request_store (~> 1.1)
parallel (1.26.3)
parallel_tests (4.9.0)
parallel_tests (4.9.1)
parallel
parser (3.3.7.0)
ast (~> 2.4.1)
Expand Down Expand Up @@ -648,7 +654,7 @@ GEM
rb-fsevent (0.11.2)
rb-inotify (0.11.1)
ffi (~> 1.0)
redcarpet (3.6.0)
redcarpet (3.6.1)
redis (4.8.1)
redis-client (0.23.2)
connection_pool
Expand All @@ -668,7 +674,7 @@ GEM
rspec-cells (0.3.10)
cells (>= 4.0.0, < 6.0.0)
rspec-rails (>= 3.0.0)
rspec-core (3.13.2)
rspec-core (3.13.3)
rspec-support (~> 3.13.0)
rspec-expectations (3.13.3)
diff-lcs (>= 1.2.0, < 2.0)
Expand Down Expand Up @@ -732,7 +738,7 @@ GEM
rb-inotify (~> 0.9, >= 0.9.7)
sassc (2.4.0)
ffi (~> 1.9)
selenium-webdriver (4.28.0)
selenium-webdriver (4.29.1)
base64 (~> 0.2)
logger (~> 1.4)
rexml (~> 3.2, >= 3.2.5)
Expand Down Expand Up @@ -780,11 +786,11 @@ GEM
activesupport (>= 6.1)
sprockets (>= 3.0.0)
ssrf_filter (1.2.0)
stringio (3.1.2)
stringio (3.1.5)
strscan (3.1.2)
temple (0.10.3)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
terminal-table (4.0.0)
unicode-display_width (>= 1.1.1, < 4)
thor (1.3.2)
tilt (2.6.0)
timeout (0.4.3)
Expand Down Expand Up @@ -818,7 +824,7 @@ GEM
web-push (3.0.1)
jwt (~> 2.0)
openssl (~> 3.0)
webmock (3.24.0)
webmock (3.25.0)
addressable (>= 2.8.0)
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
Expand All @@ -845,7 +851,7 @@ DEPENDENCIES
brakeman (~> 5.4)
byebug (~> 11.0)
decidim!
decidim-decidim_awesome
decidim-decidim_awesome!
decidim-dev!
decidim-templates!
decidim-term_customizer!
Expand Down
1 change: 1 addition & 0 deletions config/environments/production.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
# config.active_job.queue_name_prefix = "decidim_tolosa_production"

config.action_mailer.perform_caching = false
config.action_mailer.default_url_options = { protocol: "https" }

# Ignore bad email addresses and do not raise email delivery errors.
# Set this to true and configure the email server for immediate delivery to raise delivery errors.
Expand Down
4 changes: 2 additions & 2 deletions config/initializers/health_check.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@

if ENV.fetch("HEALTHCHECK_ADDITIONAL_CHECKS", nil)
HealthCheck.setup do |config|
config.standard_checks += ENV.fetch("HEALTHCHECK_ADDITIONAL_CHECKS", nil).split(" ")
config.standard_checks += ENV.fetch("HEALTHCHECK_ADDITIONAL_CHECKS", nil).split
end
end

if ENV.fetch("HEALTHCHECK_EXCLUDE_CHECKS", nil)
HealthCheck.setup do |config|
config.standard_checks -= ENV.fetch("HEALTHCHECK_EXCLUDE_CHECKS", nil).split(" ")
config.standard_checks -= ENV.fetch("HEALTHCHECK_EXCLUDE_CHECKS", nil).split
end
end
6 changes: 3 additions & 3 deletions config/puma.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@

# Specifies the `environment` that Puma will run in.
#
environment ENV.fetch("RAILS_ENV") { "development" }
environment ENV.fetch("RAILS_ENV", "development")

# Specifies the `pidfile` that Puma will use.
pidfile ENV.fetch("PIDFILE") { "tmp/pids/server.pid" }
pidfile ENV.fetch("PIDFILE", "tmp/pids/server.pid")

if ENV.fetch("RAILS_ENV") == "production"
workers ENV.fetch("WEB_CONCURRENCY", 2)
Expand All @@ -41,7 +41,7 @@
cert_dir = ENV.fetch("DEV_SSL_DIR") { "#{dev_gem.full_gem_path}/lib/decidim/dev/assets" }
ssl_bind(
"0.0.0.0",
ENV.fetch("DEV_SSL_PORT") { 3443 },
ENV.fetch("DEV_SSL_PORT", 3443),
cert_pem: File.read("#{cert_dir}/ssl-cert.pem"),
key_pem: File.read("#{cert_dir}/ssl-key.pem")
)
Expand Down
Loading
Loading