Merge pull request #351 from codeforjapan/develop

update master

.cloudformation/waf.yml

@@ -87,6 +87,8 @@ Resources:
             MetricName: AWSManagedRulesSQLiRuleSetMetric
           Statement:
             ManagedRuleGroupStatement:
+              ExcludedRules:
+                - Name: SQLi_BODY
               VendorName: AWS
               Name: AWSManagedRulesSQLiRuleSet
       Scope: CLOUDFRONT

CHANGELOG.md

@@ -1,4 +1,21 @@
 # Change Log
+## [v0.23.5-2022-02-22](https://github.com/codeforjapan/decidim-cfj/releases/tag/v0.23.5-2022-02-22)
+
+### Added
+- add new script [#318](https://github.com/codeforjapan/decidim-cfj/pull/318)
+- Add UPGRADE.md [#326](https://github.com/codeforjapan/decidim-cfj/pull/326)
+
+### Fixed
+- Fixed #24 in original Decidim [#328](https://github.com/codeforjapan/decidim-cfj/pull/328)
+- Redirect https://www.diycities.jp/ to Metadecidim Japan [#338](https://github.com/codeforjapan/decidim-cfj/pull/338)
+
+### Changed
+- Reset Decidim::ApplicationUploader#validate_inside_organization to original definition [#324](https://github.com/codeforjapan/decidim-cfj/pull/324)
+- Update docs/UPGRADE.md [#330](https://github.com/codeforjapan/decidim-cfj/pull/330)
+- Add CookieOrderable; store proposals orders in cookies [#331](https://github.com/codeforjapan/decidim-cfj/pull/331)
+- Improved input form; year of birth and name (added input restrictions and input support) [#335](https://github.com/codeforjapan/decidim-cfj/pull/335)
+- Appropriate line breaks for long comments (alphabet, etc.) [#337](https://github.com/codeforjapan/decidim-cfj/pull/337)
+
 ## [v0.23.5-2022-01-17](https://github.com/codeforjapan/decidim-cfj/releases/tag/v0.23.5-2022-01-17)
 
 ### Fixed

Gemfile.lock

@@ -551,7 +551,7 @@ GEM
     net-http-persistent (4.0.1)
       connection_pool (~> 2.2)
     netrc (0.11.0)
-    newrelic_rpm (6.15.0)
+    newrelic_rpm (8.5.0)
     nio4r (2.5.7)
     nobspw (0.6.2)
     nokogiri (1.11.3)

app/assets/stylesheets/search.scss

@@ -0,0 +1,4 @@
+/* fix decidim-core/app/assets/stylesheets/decidim/modules/_navbar.scss */
+.topbar__search {
+  display: none;
+}

config/database.yml

@@ -29,7 +29,7 @@ default: &default
 
 development:
   <<: *default
-  database: decidim-app_development
+  database: <%= ENV.fetch("DATABASE_DBNAME_DEV") { "decidim-app_development" } %>
 
   # The specified database role being used to connect to postgres.
   # To create additional roles in postgres see `$ createuser --help`.
@@ -63,7 +63,7 @@ development:
 # Do not set this db to the same as development or production.
 test:
   <<: *default
-  database: decidim-app_test
+  database: <%= ENV.fetch("DATABASE_DBNAME_TEST") { "decidim-app_test" } %>
 
 # As with config/secrets.yml, you never want to store sensitive information,
 # like your database password, in your source code. If your source code is

config/locales/ja.yml

@@ -23,6 +23,8 @@ ja:
       organization:
         primary_color: プライマリ
         secondary_color: セカンダリ
+      minutes:
+        visible: 表示する
   date:
     formats:
       decidim_short: "%Y/%m/%d"
@@ -32,6 +34,8 @@ ja:
       decidim_with_month_name_short: "%b %d"
   decidim:
     admin:
+      actions:
+        duplicate: 複製
       admin_terms_of_use:
         actions:
           refuse: 同意しない

config/routes.rb

@@ -4,6 +4,7 @@
 Rails.application.routes.draw do
   # Redirect to Metadecidim Japan
   get "/", to: redirect("https://meta.diycities.jp/"), constraints: { host: "www.diycities.jp" }
+  get "/search", to: redirect("/")
 
   mount Decidim::Core::Engine => "/"
   # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html

deployments/production-v0-23-5/00_env_options.config

@@ -10,9 +10,9 @@ option_settings:
     RDS_PASSWORD: "{{resolve:ssm:/decidim-cfj/production/RDS_PASSWORD:1}}"
     SECRET_KEY_BASE: "{{resolve:ssm:/decidim-cfj/production/SECRET_KEY_BASE:1}}"
     NEW_RELIC_LICENSE_KEY: "{{resolve:ssm:/decidim-cfj/production/NEW_RELIC_LICENSE_KEY:1}}"
-    SMTP_USERNAME: "{{resolve:ssm:/decidim-cfj/production/SMTP_USERNAME:1}}"
-    SMTP_PASSWORD: "{{resolve:ssm:/decidim-cfj/production/SMTP_PASSWORD:1}}"
-    SMTP_ADDRESS: email-smtp.us-east-1.amazonaws.com
+    SMTP_ADDRESS: "{{resolve:ssm:/decidim-cfj/production/SMTP_ADDRESS:1}}"
+    SMTP_USERNAME: "{{resolve:ssm:/decidim-cfj/production/SMTP_USERNAME:2}}"
+    SMTP_PASSWORD: "{{resolve:ssm:/decidim-cfj/production/SMTP_PASSWORD:2}}"
     SMTP_DOMAIN: diycities.jp
     AWS_BUCKET_NAME: cfj-decidim-v0235
     RAILS_SKIP_MIGRATIONS: false

deployments/staging/00_env_options.config

@@ -10,9 +10,9 @@ option_settings:
     RDS_USERNAME: "{{resolve:ssm:/decidim-cfj/staging/RDS_USERNAME:1}}"
     RDS_PASSWORD: "{{resolve:ssm:/decidim-cfj/staging/RDS_PASSWORD:1}}"
     SECRET_KEY_BASE: "{{resolve:ssm:/decidim-cfj/staging/SECRET_KEY_BASE:1}}"
-    SMTP_USERNAME: "{{resolve:ssm:/decidim-cfj/production/SMTP_USERNAME:1}}"
-    SMTP_PASSWORD: "{{resolve:ssm:/decidim-cfj/production/SMTP_PASSWORD:1}}"
-    SMTP_ADDRESS: email-smtp.us-east-1.amazonaws.com
+    SMTP_ADDRESS: "{{resolve:ssm:/decidim-cfj/production/SMTP_ADDRESS:1}}"
+    SMTP_USERNAME: "{{resolve:ssm:/decidim-cfj/production/SMTP_USERNAME:2}}"
+    SMTP_PASSWORD: "{{resolve:ssm:/decidim-cfj/production/SMTP_PASSWORD:2}}"
     SMTP_DOMAIN: diycities.jp
     AWS_BUCKET_NAME: staging-cfj-decidim
     RAILS_SKIP_MIGRATIONS: false

docs/DEVELOPMENT.md

@@ -44,6 +44,14 @@ export DATABASE_USERNAME=<yourname>
 export DATABASE_PASSWORD=<yourpassword>
 ```
 
+なお、DBのhost、port、DB名も設定したい場合は、以下のように環境変数を指定します。
+
+```
+export DATABASE_HOST=<yourhost>
+export DATABASE_PORT=<yourport>
+export DATABASE_DBNAME_DEV=<yourdbname>
+```
+
 ### 2.6 bundle install
 ```
 bundle install