Skip to content

Commit

Permalink
Merge branch 'upgrade_0.27' into staging
Browse files Browse the repository at this point in the history
  • Loading branch information
ferblape committed Sep 18, 2024
2 parents a6db7df + 0a773d8 commit 990e495
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 12 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ group :production, :straging do
gem 'newrelic_rpm'
gem "lograge"
gem "sentry-raven"
gem "sidekiq"
gem "sidekiq", "~> 6.5.6"
end

group :test do
Expand Down
14 changes: 5 additions & 9 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -715,8 +715,6 @@ GEM
ffi (~> 1.0)
redcarpet (3.6.0)
redis (4.8.1)
redis-client (0.22.2)
connection_pool
regexp_parser (2.9.2)
reline (0.5.9)
io-console (~> 0.5)
Expand Down Expand Up @@ -801,12 +799,10 @@ GEM
sentry-raven (3.1.2)
faraday (>= 1.0)
seven_zip_ruby (1.3.0)
sidekiq (7.3.0)
concurrent-ruby (< 2)
connection_pool (>= 2.3.0)
logger
rack (>= 2.2.4)
redis-client (>= 0.22.2)
sidekiq (6.5.12)
connection_pool (>= 2.2.5, < 3)
rack (~> 2.0)
redis (>= 4.5.0, < 5)
simplecov (0.21.2)
docile (~> 1.1)
simplecov-html (~> 0.11)
Expand Down Expand Up @@ -923,7 +919,7 @@ DEPENDENCIES
rspec-rails
sendgrid-ruby
sentry-raven
sidekiq
sidekiq (~> 6.5.6)
spring
spring-commands-rspec
spring-watcher-listen
Expand Down
Binary file added certs/decidim_terrassa_2023.crt
Binary file not shown.
2 changes: 1 addition & 1 deletion config/environments/production.rb
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@

# Use the lowest log level to ensure availability of diagnostic information
# when problems arise.
config.log_level = :debug
config.log_level = :info

# Silence the cache store, the decidim-term_customizer module doesn't work otherwise
# source: https://github.com/mainio/decidim-module-term_customizer/issues/38
Expand Down
4 changes: 4 additions & 0 deletions config/initializers/decidim.rb
Original file line number Diff line number Diff line change
Expand Up @@ -426,3 +426,7 @@
active: :inclusive,
if: Decidim::ParticipatoryProcess.where(decidim_participatory_process_group_id: 6).published.public_spaces.any?
end

# Disable SSL checking of the SMTP
OpenSSL::SSL::VERIFY_PEER = OpenSSL::SSL::VERIFY_NONE

8 changes: 8 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 6 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,5 +50,10 @@
},
"browserslist": [
"extends @decidim/browserslist-config"
]
],
"engines": {
"node": "16.9.1",
"npm": "7.21.1",
"yarn": "1.22.19"
}
}

0 comments on commit 990e495

Please sign in to comment.