feat: update term-customizer branch

codeforjapan · Aug 23, 2022 · 4ea0eb0 · 4ea0eb0
1 parent 62628c2
commit 4ea0eb0
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -12,6 +12,7 @@ RUN apk update \
         postgresql-dev \
         tzdata \
         zip \
+        gcompat\
     && cp /usr/share/zoneinfo/Asia/Tokyo /etc/localtime
 
 ENV YARN_VERSION=v1.22.5

diff --git a/Gemfile b/Gemfile
@@ -10,7 +10,7 @@ gem "decidim-comments", path: "decidim-comments"
 
 gem "decidim-decidim_awesome", "~> 0.8.1"
 
-gem "decidim-term_customizer", git: "https://github.com/codeforjapan/decidim-module-term_customizer.git", branch: "release/0.25-stable"
+gem "decidim-term_customizer", git: "https://github.com/codeforjapan/decidim-module-term_customizer.git", branch: "025-ja"
 
 gem "bootsnap"
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 GIT
   remote: https://github.com/codeforjapan/decidim-module-term_customizer.git
   revision: 1d20451c56b7809cf0d509bbb4d0ac63d4791c8c
-  branch: release/0.25-stable
+  branch: 025-ja
   specs:
     decidim-term_customizer (0.25.0)
       decidim-admin (~> 0.25.0)

diff --git a/decidim-user_extension/decidim-user_extension.gemspec b/decidim-user_extension/decidim-user_extension.gemspec
@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.summary = "A exntesional attributes component for decidim's User model."
   spec.description = "A exntesional attributes component for decidim's User model."
   spec.license = "AGPL-3.0"
-  spec.required_ruby_version = ">= 2.7.0"
+  spec.required_ruby_version = ">= 2.7.4"
 
   spec.files = Dir[
     "{app,config,db,lib}/**/*",

diff --git a/decidim-user_extension/lib/decidim/user_extension/engine.rb b/decidim-user_extension/lib/decidim/user_extension/engine.rb
@@ -21,7 +21,7 @@ class Engine < ::Rails::Engine
         # root to: "user_extension#index"
       end
 
-      initializer "decidim_user_extension.assets_path" do
+      initializer "decidim_user_extension.webpacker.assets_path" do
         Decidim.register_assets_path File.expand_path("app/packs", root)
       end