Skip to content

Commit

Permalink
feat: Add module gallery to 0.27 (#450)
Browse files Browse the repository at this point in the history 
* feat: Add module gallery to 0.27

* fix: Add require false to decidim-gallery

* lint: Fix rubocop offenses

* fix: reactivate decidim-gallery

* fix: Use module Gallery without Deface (#475)

* fix: Use module Gallery without Deface

* fix: allow to deactivate Deface on dev mode

* fix: Fix bundler version

* fix: Add x86_64-linux support in Gemfile.lock

---------

Co-authored-by: Pauline Bessoles <[email protected]>
Co-authored-by: quentinchampenois <[email protected]>
  • Loading branch information
@AyakorK @paulinebessoles @Quentinchampenois
3 people authored Jan 22, 2024
1 parent b6776e0 commit f4ae434
Show file tree
Hide file tree
Showing 4 changed files with 75 additions and 63 deletions.
4 changes: 2 additions & 2 deletions Dockerfile.local
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ RUN yarn install --frozen-lock
COPY . .

RUN bundle exec bootsnap precompile --gemfile app/ lib/ config/ bin/ db/ && \
bundle exec rails deface:precompile && \
bundle exec rails assets:precompile
bundle exec rails assets:precompile && \
bundle exec rails deface:precompile

run mkdir certificate-https-local
RUN openssl req -new -newkey rsa:4096 -days 365 -nodes -x509 -subj "/C=FR/ST=France/L=Paris/O=decidim/CN=decidim.eu" -keyout ./certificate-https-local/key.pem -out ./certificate-https-local/cert.pem;
Expand Down
5 changes: 2 additions & 3 deletions Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,9 @@ gem "decidim-cache_cleaner"
gem "decidim-decidim_awesome"
gem "decidim-extended_socio_demographic_authorization_handler", git: "https://github.com/OpenSourcePolitics/decidim-module-extended_socio_demographic_authorization_handler.git",
branch: DECIDIM_BRANCH
gem "decidim-extra_user_fields", git: "https://github.com/PopulateTools/decidim-module-extra_user_fields.git", branch: "extra-fields-0-27"
gem "decidim-extra_user_fields", git: "https://github.com/PopulateTools/decidim-module-extra_user_fields.git", branch: "release/0.27-stable"
gem "decidim-friendly_signup", git: "https://github.com/OpenSourcePolitics/decidim-module-friendly_signup.git"
# TODO: Bump to 0.27.0 when released
# gem "decidim-gallery"
gem "decidim-gallery", git: "https://github.com/OpenSourcePolitics/decidim-module-gallery.git", branch: "fix/nokogiri_deps"
gem "decidim-homepage_interactive_map", git: "https://github.com/OpenSourcePolitics/decidim-module-homepage_interactive_map.git", branch: DECIDIM_BRANCH
gem "decidim-ludens", git: "https://github.com/OpenSourcePolitics/decidim-ludens.git", branch: DECIDIM_BRANCH
gem "decidim-phone_authorization_handler", git: "https://github.com/OpenSourcePolitics/decidim-module_phone_authorization_handler", branch: DECIDIM_BRANCH
Expand Down
128 changes: 70 additions & 58 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,20 @@ GIT

GIT
remote: https://github.com/OpenSourcePolitics/decidim-module-friendly_signup.git
revision: 4ecc478bb8492653b7c7120103fcb3c2d1f74576
revision: 1a054faf964cc6ed07f1bec47cb92f0083a5bcb4
specs:
decidim-friendly_signup (0.4.5)
decidim-core (~> 0.27)

GIT
remote: https://github.com/OpenSourcePolitics/decidim-module-gallery.git
revision: 726fab33984c3adeec30cf90d0e1b4ad3881787d
branch: fix/nokogiri_deps
specs:
decidim-gallery (0.26.0)
decidim-admin (>= 0.26.0, < 0.28.0)
decidim-core (>= 0.26.0, < 0.28.0)

GIT
remote: https://github.com/OpenSourcePolitics/decidim-module-homepage_interactive_map.git
revision: dd685166fdf953a11bd6a9e0dac56feca3bd0708
Expand Down Expand Up @@ -67,8 +76,8 @@ GIT

GIT
remote: https://github.com/PopulateTools/decidim-module-extra_user_fields.git
revision: 0fee03bf94dce989d36153cfa2b973c388172fc3
branch: extra-fields-0-27
revision: ef262d6619ef254de1379278f56c4c6af789e54c
branch: release/0.27-stable
specs:
decidim-extra_user_fields (0.27.2)
country_select (~> 4.0)
Expand Down Expand Up @@ -98,6 +107,7 @@ GIT
GEM
remote: https://rubygems.org/
specs:
abbrev (0.1.2)
actioncable (6.1.7.6)
actionpack (= 6.1.7.6)
activesupport (= 6.1.7.6)
Expand Down Expand Up @@ -172,28 +182,28 @@ GEM
zeitwerk (~> 2.3)
acts_as_list (0.9.19)
activerecord (>= 3.0)
addressable (2.8.5)
addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
aes_key_wrap (1.1.0)
ast (2.4.2)
attr_required (1.0.1)
attr_required (1.0.2)
aws-eventstream (1.3.0)
aws-partitions (1.856.0)
aws-sdk-core (3.188.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (1.882.0)
aws-sdk-core (3.190.3)
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.73.0)
aws-sdk-kms (1.76.0)
aws-sdk-core (~> 3, >= 3.188.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.139.0)
aws-sdk-core (~> 3, >= 3.188.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.7.0)
aws-sigv4 (~> 1.8)
aws-sigv4 (1.8.0)
aws-eventstream (~> 1, >= 1.0.2)
axe-core-api (4.8.0)
axe-core-api (4.8.1)
dumb_delegator
virtus
axe-core-rspec (4.1.0)
Expand All @@ -217,7 +227,7 @@ GEM
smart_properties
bindata (2.4.15)
bindex (0.8.1)
bootsnap (1.17.0)
bootsnap (1.17.1)
msgpack (~> 1.2)
brakeman (5.4.1)
browser (2.7.1)
Expand All @@ -232,7 +242,7 @@ GEM
rack-test (>= 0.6.3)
regexp_parser (>= 1.5, < 3.0)
xpath (~> 3.2)
carrierwave (2.2.4)
carrierwave (2.2.5)
activemodel (>= 5.0.0)
activesupport (>= 5.0.0)
addressable (~> 2.6)
Expand Down Expand Up @@ -268,7 +278,7 @@ GEM
coffee-script-source (1.12.2)
colorize (0.8.1)
commonmarker (0.23.10)
concurrent-ruby (1.2.2)
concurrent-ruby (1.2.3)
connection_pool (2.4.1)
countries (3.1.0)
i18n_data (~> 0.11.0)
Expand Down Expand Up @@ -510,7 +520,7 @@ GEM
nokogiri (>= 1.13.2, < 1.15.0)
rubyzip (~> 2.3.0)
docile (1.4.0)
doorkeeper (5.6.7)
doorkeeper (5.6.8)
railties (>= 5)
doorkeeper-i18n (4.0.1)
dotenv (2.8.1)
Expand All @@ -532,7 +542,7 @@ GEM
escape_utils (1.3.0)
et-orbi (1.2.7)
tzinfo
excon (0.104.0)
excon (0.109.0)
execjs (2.9.1)
extended-markdown-filter (0.7.0)
html-pipeline (~> 2.9)
Expand All @@ -543,13 +553,12 @@ GEM
railties (>= 3.0.0)
faker (2.23.0)
i18n (>= 1.8.11, < 2)
faraday (2.7.12)
base64
faraday-net_http (>= 2.0, < 3.1)
ruby2_keywords (>= 0.0.4)
faraday (2.9.0)
faraday-net_http (>= 2.0, < 3.2)
faraday-follow_redirects (0.3.0)
faraday (>= 1, < 3)
faraday-net_http (3.0.2)
faraday-net_http (3.1.0)
net-http
ffi (1.16.3)
file_validators (3.0.0)
activemodel (>= 3.2)
Expand All @@ -558,7 +567,7 @@ GEM
fog-core (~> 2.1)
fog-json (~> 1.1)
fog-xml (~> 0.1)
fog-core (2.3.0)
fog-core (2.4.0)
builder
excon (~> 0.71)
formatador (>= 0.2, < 2.0)
Expand Down Expand Up @@ -588,11 +597,12 @@ GEM
graphql (~> 1.12)
html-pipeline (~> 2.9)
sass (~> 3.4)
hashdiff (1.0.1)
hashdiff (1.1.0)
hashie (5.0.0)
health_check (3.1.0)
railties (>= 5.0)
highline (2.1.0)
highline (3.0.0)
abbrev
hkdf (0.3.0)
html-pipeline (2.14.3)
activesupport (>= 2)
Expand All @@ -613,7 +623,7 @@ GEM
rainbow (>= 2.2.2, < 4.0)
terminal-table (>= 1.5.1)
i18n_data (0.11.0)
icalendar (2.10.0)
icalendar (2.10.1)
ice_cube (~> 0.16)
ice_cube (0.16.4)
ice_nine (0.11.2)
Expand All @@ -623,10 +633,11 @@ GEM
invisible_captcha (0.13.0)
rails (>= 3.2.0)
jmespath (1.6.2)
json (2.6.3)
json-jwt (1.16.3)
json (2.7.1)
json-jwt (1.16.5)
activesupport (>= 4.2)
aes_key_wrap
base64
bindata
faraday (~> 2.0)
faraday-follow_redirects
Expand Down Expand Up @@ -680,12 +691,12 @@ GEM
mixlib-config (>= 2.2.1, < 4)
mixlib-shellout
method_source (1.0.0)
mime-types (3.5.1)
mime-types (3.5.2)
mime-types-data (~> 3.2015)
mime-types-data (3.2023.1003)
mime-types-data (3.2023.1205)
mini_magick (4.12.0)
mini_mime (1.1.5)
minitest (5.20.0)
minitest (5.21.2)
mixlib-cli (2.1.8)
mixlib-config (3.0.27)
tomlrb
Expand All @@ -695,20 +706,20 @@ GEM
multi_json (1.15.0)
multi_xml (0.6.0)
mustache (1.1.1)
net-imap (0.4.6)
net-http (0.4.1)
uri
net-imap (0.4.9.1)
date
net-protocol
net-pop (0.1.2)
net-protocol
net-protocol (0.2.2)
timeout
net-smtp (0.4.0)
net-smtp (0.4.0.1)
net-protocol
nio4r (2.6.1)
nio4r (2.7.0)
nokogiri (1.13.4-arm64-darwin)
racc (~> 1.4)
nokogiri (1.13.4-x86_64-darwin)
racc (~> 1.4)
nokogiri (1.13.4-x86_64-linux)
racc (~> 1.4)
oauth (1.1.0)
Expand All @@ -724,7 +735,7 @@ GEM
rack (>= 1.2, < 4)
snaky_hash (~> 2.0)
version_gem (~> 1.1)
omniauth (2.1.1)
omniauth (2.1.2)
hashie (>= 3.4.6)
rack (>= 2.2.3)
rack-protection
Expand Down Expand Up @@ -768,18 +779,18 @@ 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.4)
ast (~> 2.4.1)
racc
pg (1.1.4)
pg_search (2.3.6)
activerecord (>= 5.2)
activesupport (>= 5.2)
polyglot (0.3.5)
premailer (1.21.0)
premailer (1.22.0)
addressable
css_parser (>= 1.12.0)
htmlentities (>= 4.0.0)
Expand All @@ -788,7 +799,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 @@ -803,7 +814,8 @@ GEM
httpclient
json-jwt (>= 1.11.0)
rack (>= 2.1.0)
rack-protection (3.1.0)
rack-protection (3.2.0)
base64 (>= 0.1.0)
rack (~> 2.2, >= 2.2.4)
rack-proxy (0.7.7)
rack
Expand Down Expand Up @@ -854,11 +866,11 @@ GEM
ffi (~> 1.0)
redcarpet (3.6.0)
redis (4.8.1)
redis-client (0.18.0)
redis-client (0.19.1)
connection_pool
redlock (2.0.6)
redis-client (>= 0.14.1, < 1.0.0)
regexp_parser (2.8.2)
regexp_parser (2.9.0)
request_store (1.5.1)
rack (>= 1.4)
responders (3.1.1)
Expand All @@ -872,9 +884,9 @@ GEM
rspec-core (~> 3.12.0)
rspec-expectations (~> 3.12.0)
rspec-mocks (~> 3.12.0)
rspec-cells (0.3.8)
rspec-cells (0.3.9)
cells (>= 4.0.0, < 6.0.0)
rspec-rails (>= 3.0.0, < 6.1.0)
rspec-rails (>= 3.0.0, < 6.2.0)
rspec-core (3.12.2)
rspec-support (~> 3.12.0)
rspec-expectations (3.12.3)
Expand Down Expand Up @@ -922,7 +934,6 @@ GEM
ruby-progressbar (1.13.0)
ruby-vips (2.2.0)
ffi (~> 1.12)
ruby2_keywords (0.0.5)
rubyXL (3.4.25)
nokogiri (>= 1.10.8)
rubyzip (>= 1.3.0)
Expand All @@ -942,15 +953,15 @@ GEM
rexml (~> 3.2, >= 3.2.5)
rubyzip (>= 1.2.2)
semantic_range (3.0.0)
sendgrid-ruby (6.6.2)
sendgrid-ruby (6.7.0)
ruby_http_client (~> 3.4)
sentry-rails (5.13.0)
sentry-rails (5.16.1)
railties (>= 5.0)
sentry-ruby (~> 5.13.0)
sentry-ruby (5.13.0)
sentry-ruby (~> 5.16.1)
sentry-ruby (5.16.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
sentry-sidekiq (5.13.0)
sentry-ruby (~> 5.13.0)
sentry-sidekiq (5.16.1)
sentry-ruby (~> 5.16.1)
sidekiq (>= 3.0)
seven_zip_ruby (1.3.0)
sidekiq (6.5.12)
Expand Down Expand Up @@ -1014,6 +1025,7 @@ GEM
uber (0.1.0)
unicode-display_width (2.5.0)
unicode_utils (1.4.0)
uri (0.13.0)
valid_email2 (2.3.1)
activemodel (>= 3.2)
mail (~> 2.5)
Expand Down Expand Up @@ -1075,7 +1087,6 @@ GEM

PLATFORMS
arm64-darwin-22
x86_64-darwin-22
x86_64-linux

DEPENDENCIES
Expand All @@ -1095,6 +1106,7 @@ DEPENDENCIES
decidim-extended_socio_demographic_authorization_handler!
decidim-extra_user_fields!
decidim-friendly_signup!
decidim-gallery!
decidim-homepage_interactive_map!
decidim-initiatives (~> 0.27.0)
decidim-ludens!
Expand Down Expand Up @@ -1137,4 +1149,4 @@ RUBY VERSION
ruby 3.0.6p216

BUNDLED WITH
2.2.33
2.4.9
1 change: 1 addition & 0 deletions config/environments/development.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,4 +59,5 @@
# are known to cause issue with moderation due to expiration
# Setting this to 100 years should be enough
config.global_id.expires_in = 100.years
config.deface.enabled = ENV.fetch("DEFACE_ENABLED", nil) == "true"
end

0 comments on commit f4ae434

Please sign in to comment.