Merge pull request #391 from codeforjapan/develop

add term customizer

.github/workflows/lint.yml

@@ -0,0 +1,29 @@
+name: Lint
+
+on:
+  push:
+    branches:
+    - master
+    - develop
+  pull_request:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        fetch-depth: 1
+    - name: apt-get
+      run: |
+        sudo apt-get update -y
+        sudo apt-get -yqq install libpq-dev postgresql-client
+    - name: Set up Ruby 2.7
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: 2.7
+        bundler-cache: true
+    - name: Lint by RuboCop
+      run: |
+        bundle exec rubocop --parallel

.github/workflows/rails-test.yml

@@ -1,6 +1,11 @@
 name: Rails Tests
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+    - master
+    - develop
+  pull_request:
 
 jobs:
   build:
@@ -50,6 +55,3 @@ jobs:
     - name: Test with RSpec
       run: |
         bundle exec rails spec
-    - name: Lint by RuboCop
-      run: |
-        bundle exec rubocop --parallel

CHANGELOG.md

@@ -1,4 +1,44 @@
 # Change Log
+## [v0.24.3-2022-04-14](https://github.com/codeforjapan/decidim-cfj/releases/tag/v0.23.5-2022-04-14)
+
+### Added
+- Add JA locale data for verification [#367](https://github.com/codeforjapan/decidim-cfj/pull/367)
+
+### Fixed
+- Fix AuthorizeUser; "Fix verification report with multitenants" [#366](https://github.com/codeforjapan/decidim-cfj/pull/366)
+
+## [v0.24.3-2022-04-11](https://github.com/codeforjapan/decidim-cfj/releases/tag/v0.23.5-2022-04-11)
+
+### Fixed
+- Fix error in /debates/versions [#361](https://github.com/codeforjapan/decidim-cfj/pull/361)
+- Fix undefined local variable or method component error [#363](https://github.com/codeforjapan/decidim-cfj/pull/363)
+
+## [v0.24.3-2022-04-08](https://github.com/codeforjapan/decidim-cfj/releases/tag/v0.23.5-2022-04-08)
+
+### Added
+- Feedback from decidim/decidim v0.24.3 [#329](https://github.com/codeforjapan/decidim-cfj/pull/329)
+
+### Fixed
+- Reset Decidim::ApplicationUploader#validate_inside_organization to original definition [#324](https://github.com/codeforjapan/decidim-cfj/pull/324)
+- Fixed not to be displayed when the history is too large [#359](https://github.com/codeforjapan/decidim-cfj/pull/359)
+- Fix GitHub Actions: move env, no need bundler  [#360](https://github.com/codeforjapan/decidim-cfj/pull/360)
+
+### Changed
+- update decidim v0.24.3  [#312](https://github.com/codeforjapan/decidim-cfj/pull/312)
+- update production environment name  [#356](https://github.com/codeforjapan/decidim-cfj/pull/356)
+
+## [v0.23.5-2022-03-06](https://github.com/codeforjapan/decidim-cfj/releases/tag/v0.23.5-2022-03-06)
+
+### Fixed
+- chore: disabled SQLi_BODY rule on waf for uploading image [#343](https://github.com/codeforjapan/decidim-cfj/pull/343)
+- Fix translation: Is visible duplicate  [#349](https://github.com/codeforjapan/decidim-cfj/pull/349)
+
+### Changed
+- Allow to change DB name in dev/test [#342](https://github.com/codeforjapan/decidim-cfj/pull/342)
+- use aws ses ap-northeast-1 region [#346](https://github.com/codeforjapan/decidim-cfj/pull/346)
+- Update newrelic_rpm gem [#347](https://github.com/codeforjapan/decidim-cfj/pull/347)
+- Remove search box [#348](https://github.com/codeforjapan/decidim-cfj/pull/348)
+
 ## [v0.23.5-2022-02-22](https://github.com/codeforjapan/decidim-cfj/releases/tag/v0.23.5-2022-02-22)
 
 ### Added

Gemfile

@@ -10,6 +10,9 @@ gem "decidim-comments", path: "decidim-comments"
 
 gem "decidim-decidim_awesome", "~> 0.7.0"
 
+## gem "decidim-term_customizer", git: "https://github.com/mainio/decidim-module-term_customizer.git", branch: "0.24-stable"
+gem "decidim-term_customizer", git: "https://github.com/codeforjapan/decidim-module-term_customizer.git", branch: "024-ja"
+
 gem "bootsnap", "~> 1.3"
 
 gem "puma", ">= 5.0.0"

Gemfile.lock

@@ -1,3 +1,12 @@
+GIT
+  remote: https://github.com/codeforjapan/decidim-module-term_customizer.git
+  revision: ae993619f88761ef4133299e625450621c8f24c8
+  branch: 024-ja
+  specs:
+    decidim-term_customizer (0.24.0)
+      decidim-admin (~> 0.24.0)
+      decidim-core (~> 0.24.0)
+
 PATH
   remote: decidim-comments
   specs:
@@ -12,7 +21,7 @@ PATH
     decidim-user_extension (0.1.0)
       decidim-admin
       decidim-core
-      rails (~> 5.2.4, >= 5.2.4.4)
+      rails
 
 GEM
   remote: https://rubygems.org/
@@ -892,6 +901,7 @@ DEPENDENCIES
   decidim-comments!
   decidim-decidim_awesome (~> 0.7.0)
   decidim-dev (= 0.24.3)
+  decidim-term_customizer!
   decidim-user_extension!
   deface
   dotenv-rails