Skip to content

Commit

Permalink
Merge branch 'upgrade-27' into staging
Browse files Browse the repository at this point in the history
  • Loading branch information
microstudi committed Jan 9, 2024
2 parents 0fc9cd0 + 6494d57 commit 0dfd757
Show file tree
Hide file tree
Showing 8 changed files with 270 additions and 309 deletions.
6 changes: 3 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ source "https://rubygems.org"

ruby RUBY_VERSION

DECIDIM_VERSION = { github: "decidim/decidim", tag: "v0.27.5" }.freeze
DECIDIM_VERSION = { github: "decidim/decidim", branch: "release/0.27-stable" }.freeze

gem "decidim", DECIDIM_VERSION
gem "decidim-consultations", DECIDIM_VERSION

gem "decidim-action_delegator", github: "coopdevs/decidim-module-action_delegator", branch: "main"
gem "decidim-action_delegator", github: "coopdevs/decidim-module-action_delegator"
gem "decidim-decidim_awesome", github: "decidim-ice/decidim-module-decidim_awesome"
gem "decidim-term_customizer", github: "mainio/decidim-module-term_customizer", branch: "master"
gem "decidim-term_customizer", github: "mainio/decidim-module-term_customizer"

gem "bootsnap", "~> 1.7"
gem "puma", ">= 5.0.0"
Expand Down
52 changes: 25 additions & 27 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
GIT
remote: https://github.com/coopdevs/decidim-module-action_delegator.git
revision: 9c77d21c298482bd8882b9a22579114e81c141ae
branch: main
specs:
decidim-action_delegator (0.8.0)
decidim-admin (>= 0.27.0, < 0.28)
Expand All @@ -13,7 +12,7 @@ GIT

GIT
remote: https://github.com/decidim-ice/decidim-module-decidim_awesome.git
revision: 720e68b1812490b65292c8fc203f35372a7aed2c
revision: af92eb190d4c00388a69da79f4656b5c5ec7a23d
specs:
decidim-decidim_awesome (0.10.2)
decidim-admin (>= 0.26.0, < 0.28)
Expand All @@ -23,8 +22,8 @@ GIT

GIT
remote: https://github.com/decidim/decidim.git
revision: c781f36e848ac98c2b961221685c5d4814260af6
tag: v0.27.5
revision: 2b7037064de8367839227795e9cad40ac22c75a0
branch: release/0.27-stable
specs:
decidim (0.27.5)
decidim-accountability (= 0.27.5)
Expand Down Expand Up @@ -200,8 +199,7 @@ GIT

GIT
remote: https://github.com/mainio/decidim-module-term_customizer.git
revision: abbf0c69e1bcaafebc5aa4f8da22fdb64ce62149
branch: master
revision: fced93404e8a9bb96202cf9fad6a86a84937fd0a
specs:
decidim-term_customizer (0.27.0)
decidim-admin (~> 0.27.0)
Expand Down Expand Up @@ -281,21 +279,21 @@ GEM
gyoku (>= 0.4.0)
nokogiri
ast (2.4.2)
aws-eventstream (1.2.0)
aws-partitions (1.854.0)
aws-sdk-core (3.187.1)
aws-eventstream (~> 1, >= 1.0.2)
aws-eventstream (1.3.0)
aws-partitions (1.877.0)
aws-sdk-core (3.190.1)
aws-eventstream (~> 1, >= 1.3.0)
aws-partitions (~> 1, >= 1.651.0)
aws-sigv4 (~> 1.5)
aws-sigv4 (~> 1.8)
jmespath (~> 1, >= 1.6.1)
aws-sdk-kms (1.72.0)
aws-sdk-core (~> 3, >= 3.184.0)
aws-sdk-kms (1.76.0)
aws-sdk-core (~> 3, >= 3.188.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.137.0)
aws-sdk-core (~> 3, >= 3.181.0)
aws-sdk-s3 (1.142.0)
aws-sdk-core (~> 3, >= 3.189.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.6)
aws-sigv4 (1.6.1)
aws-sigv4 (~> 1.8)
aws-sigv4 (1.8.0)
aws-eventstream (~> 1, >= 1.0.2)
axe-core-api (4.8.0)
dumb_delegator
Expand Down Expand Up @@ -630,10 +628,10 @@ GEM
paper_trail (12.3.0)
activerecord (>= 5.2)
request_store (~> 1.1)
parallel (1.23.0)
parallel (1.24.0)
parallel_tests (3.13.0)
parallel
parser (3.2.2.4)
parser (3.3.0.2)
ast (~> 2.4.1)
racc
pg (1.1.4)
Expand All @@ -650,7 +648,7 @@ GEM
net-smtp
premailer (~> 1.7, >= 1.7.9)
public_suffix (5.0.4)
puma (5.6.7)
puma (5.6.8)
nio4r (~> 2.0)
raabro (1.4.0)
racc (1.7.3)
Expand All @@ -659,7 +657,7 @@ GEM
rack (>= 1.0, < 4)
rack-cors (1.1.1)
rack (>= 2.0.0)
rack-mini-profiler (3.1.1)
rack-mini-profiler (3.3.0)
rack (>= 1.2.0)
rack-protection (3.2.0)
base64 (>= 0.1.0)
Expand Down Expand Up @@ -713,9 +711,9 @@ GEM
ffi (~> 1.0)
redcarpet (3.6.0)
redis (4.8.1)
redis-client (0.18.0)
redis-client (0.19.1)
connection_pool
regexp_parser (2.8.2)
regexp_parser (2.9.0)
request_store (1.5.1)
rack (>= 1.4)
responders (3.1.1)
Expand Down Expand Up @@ -808,7 +806,7 @@ GEM
connection_pool (>= 2.3.0)
rack (>= 2.2.4)
redis-client (>= 0.14.0)
sidekiq-cron (1.11.0)
sidekiq-cron (1.12.0)
fugit (~> 1.8)
globalid (>= 1.0.1)
sidekiq (>= 6)
Expand All @@ -827,7 +825,7 @@ GEM
version_gem (~> 1.1, >= 1.1.1)
social-share-button (1.2.4)
coffee-rails
spring (4.1.2)
spring (4.1.3)
spring-watcher-listen (2.1.0)
listen (>= 2.7, < 4.0)
spring (>= 4)
Expand All @@ -848,7 +846,7 @@ GEM
tilt (2.3.0)
timeout (0.4.1)
tomlrb (2.0.3)
twilio-ruby (6.8.2)
twilio-ruby (6.9.0)
faraday (>= 0.9, < 3.0)
jwt (>= 1.5, < 3.0)
nokogiri (>= 1.6, < 2.0)
Expand Down Expand Up @@ -941,4 +939,4 @@ RUBY VERSION
ruby 3.0.6p216

BUNDLED WITH
2.4.20
2.3.20
115 changes: 39 additions & 76 deletions package-lock.json

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

Loading

0 comments on commit 0dfd757

Please sign in to comment.